Skip to content

Commit

Permalink
Icon Fixes
Browse files Browse the repository at this point in the history
Fixes icons for monkey cube, and breaker box
adds flour back to wheat
Fixes circuit printers input
Other fixes
  • Loading branch information
Stakks committed Jul 17, 2018
1 parent cadc590 commit 384c127
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 13 deletions.
4 changes: 3 additions & 1 deletion code/modules/hydroponics/grown.dm
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,9 @@

// Glow gene procs
/obj/item/weapon/reagent_containers/food/snacks/grown/Destroy()
var/datum/plant_gene/trait/glow/G = seed.get_gene(/datum/plant_gene/trait/glow)
var/datum/plant_gene/trait/glow/G
if(seed)
G = seed.get_gene(/datum/plant_gene/trait/glow)
if(G && ismob(loc))
loc.set_light(-G.get_lum(seed))
return ..()
Expand Down
12 changes: 5 additions & 7 deletions code/modules/hydroponics/grown/cannabis.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/obj/item/seeds/cannabis/death,
/obj/item/seeds/cannabis/white,
/obj/item/seeds/cannabis/ultimate)
reagents_add = list("space_drugs" = 0.15, "lipolicide" = 0.35) // gives u the munchies
reagents_add = list("space_drugs" = 0.15) // gives u the munchies


/obj/item/seeds/cannabis/rainbow
Expand All @@ -29,7 +29,7 @@
icon_dead = "megacannabis-dead"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/rainbow
mutatelist = list()
reagents_add = list("mindbreaker" = 0.15, "lipolicide" = 0.35)
reagents_add = list("mindbreaker" = 0.15)
rarity = 40

/obj/item/seeds/cannabis/death
Expand All @@ -42,7 +42,7 @@
icon_dead = "blackcannabis-dead"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/death
mutatelist = list()
reagents_add = list("cyanide" = 0.35, "space_drugs" = 0.15, "lipolicide" = 0.15)
reagents_add = list("cyanide" = 0.35, "space_drugs" = 0.15)
rarity = 40

/obj/item/seeds/cannabis/white
Expand All @@ -55,7 +55,7 @@
icon_dead = "whitecannabis-dead"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/white
mutatelist = list()
reagents_add = list("omnizine" = 0.35, "space_drugs" = 0.15, "lipolicide" = 0.15)
reagents_add = list("omnizine" = 0.35, "space_drugs" = 0.15)
rarity = 40


Expand All @@ -74,16 +74,14 @@
"mercury" = 0.15,
"lithium" = 0.15,
"atropine" = 0.15,
"haloperidol" = 0.15,
"methamphetamine" = 0.15,
"capsaicin" = 0.15,
"barbers_aid" = 0.15,
"bath_salts" = 0.15,
"itching_powder" = 0.15,
"crank" = 0.15,
"krokodil" = 0.15,
"histamine" = 0.15,
"lipolicide" = 0.15)
"histamine" = 0.15)
rarity = 69


Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/cereals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
potency = 15
icon_dead = "wheat-dead"
mutatelist = list(/obj/item/seeds/wheat/oat, /obj/item/seeds/wheat/meat)
reagents_add = list("nutriment" = 0.04)
reagents_add = list("nutriment" = 0.04, "flour" = 0.08)

/obj/item/weapon/reagent_containers/food/snacks/grown/wheat
seed = /obj/item/seeds/wheat
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/kudzu.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
growthstages = 4
rarity = 30
var/list/mutations = list()
reagents_add = list("charcoal" = 0.04, "nutriment" = 0.02)
reagents_add = list("anti_toxin" = 0.04, "nutriment" = 0.02)

/obj/item/seeds/kudzu/Copy()
var/obj/item/seeds/kudzu/S = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/mushrooms.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
potency = 15
growthstages = 4
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
reagents_add = list("morphine" = 0.35, "charcoal" = 0.35, "nutriment" = 0)
reagents_add = list("morphine" = 0.35, "anti_toxin" = 0.35, "nutriment" = 0)

/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi
seed = /obj/item/seeds/reishi
Expand Down
4 changes: 3 additions & 1 deletion code/modules/hydroponics/growninedible.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@

// Glow gene procs
/obj/item/weapon/grown/Destroy()
var/datum/plant_gene/trait/glow/G = seed.get_gene(/datum/plant_gene/trait/glow)
var/datum/plant_gene/trait/glow/G
if(seed)
G = seed.get_gene(/datum/plant_gene/trait/glow)
if(G && ismob(loc))
loc.set_light(-G.get_lum(seed))
return ..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/integrated_electronics/core/printer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
to_chat(user, "<span class='warning'>\The [src] is too full to add more metal.</span>")
return
if(stack.amount >= num)
stack.use(num)
stack.use(Ceiling(num))
to_chat(user, "<span class='notice'>You add [num] sheet\s to \the [src].</span>")
metal += num * metal_per_sheet
interact(user)
Expand Down
Binary file modified icons/obj/food/food.dmi
Binary file not shown.
Binary file modified icons/obj/power.dmi
Binary file not shown.

0 comments on commit 384c127

Please sign in to comment.