diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index ccb5ff4dd4a..49ba664619f 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -162,7 +162,7 @@
name = "plant bag"
icon = 'icons/obj/hydroponics/equipment.dmi'
icon_state = "plantbag"
- storage_slots = 100; //the number of plant pieces it can carry.
+ storage_slots = 100 //the number of plant pieces it can carry.
max_combined_w_class = 100 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
max_w_class = 3
w_class = 1
diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm
index ce5885e2056..61ba1b5350d 100644
--- a/code/modules/events/spacevine.dm
+++ b/code/modules/events/spacevine.dm
@@ -271,7 +271,7 @@
holder.health = holder.maxhealth
/datum/spacevine_mutation/woodening/on_hit(obj/effect/spacevine/holder, mob/living/hitter, obj/item/I, expected_damage)
- if(is_sharp(I))
+ if(!is_sharp(I))
. = expected_damage * 0.5
else
. = expected_damage
@@ -459,8 +459,10 @@
SV.mutations |= parent.mutations
SV.color = parent.color
if(prob(mutativeness))
- var/datum/spacevine_mutation/randmut = pick(mutations_list - SV.mutations)
- randmut.add_mutation_to_vinepiece(SV)
+ var/list/random_mutations_picked = mutations_list - SV.mutations
+ if(random_mutations_picked.len)
+ var/datum/spacevine_mutation/randmut = pick(random_mutations_picked)
+ randmut.add_mutation_to_vinepiece(SV)
for(var/datum/spacevine_mutation/SM in SV.mutations)
SM.on_birth(SV)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm
index 56159c8b7d6..edf714d0f21 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm
@@ -14,7 +14,6 @@
var/global/list/allowed_items = list (
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = "tomatojuice",
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot = "carrotjuice",
- /obj/item/weapon/reagent_containers/food/snacks/grown/berries = "berryjuice",
/obj/item/weapon/reagent_containers/food/snacks/grown/grapes = "grapejuice",
/obj/item/weapon/reagent_containers/food/snacks/grown/grapes/green = "grapejuice",
/obj/item/weapon/reagent_containers/food/snacks/grown/banana = "banana",
@@ -25,6 +24,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon = "watermelonjuice",
/obj/item/weapon/reagent_containers/food/snacks/watermelonslice = "watermelonjuice",
/obj/item/weapon/reagent_containers/food/snacks/grown/berries/poison = "poisonberryjuice",
+ /obj/item/weapon/reagent_containers/food/snacks/grown/berries = "berryjuice",
/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin = "pumpkinjuice",
/obj/item/weapon/reagent_containers/food/snacks/grown/blumpkin = "blumpkinjuice",
)
diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm
index 81067dd17c0..4d07f17bb4c 100644
--- a/code/modules/hydroponics/grown/chili.dm
+++ b/code/modules/hydroponics/grown/chili.dm
@@ -71,7 +71,6 @@
name = "ghost chili"
desc = "It seems to be vibrating gently."
icon_state = "ghostchilipepper"
- var/mob/held_mob
filling_color = "#F8F8FF"
bitesize_mod = 4
origin_tech = "biotech=4;magnets=5"
\ No newline at end of file
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index c73aa971c4d..e531c3d5897 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -23,7 +23,7 @@
var/harvest = 0 //Ready to harvest?
var/obj/item/seeds/myseed = null //The currently planted seed
var/rating = 1
- var/unwrenchable = 1
+ var/wrenchable = 1
var/recent_bee_visit = FALSE //Have we been visited by a bee recently, so bees dont overpollinate one plant
var/using_irrigation = FALSE //If the tray is connected to other trays via irrigation hoses
var/self_sustaining = FALSE //If the tray generates nutrients and water on its own
@@ -83,13 +83,7 @@
if(exchange_parts(user, I))
return
- if(istype(I, /obj/item/weapon/wrench))
- if(using_irrigation)
- to_chat(user, "Disconnect the hoses first!")
- else if(default_unfasten_wrench(user, I))
- return
-
- if(istype(I, /obj/item/weapon/crowbar))
+ if(iscrowbar(I))
if(using_irrigation)
to_chat(user, "Disconnect the hoses first!")
else if(default_deconstruction_crowbar(I, 1))
@@ -839,7 +833,7 @@
return
S.handle_item_insertion(G, 1)
- else if(istype(O, /obj/item/weapon/wrench) && unwrenchable)
+ else if(iswrench(O) && wrenchable)
if(using_irrigation)
to_chat(user, "Disconnect the hoses first!")
return
@@ -864,7 +858,7 @@
user.visible_message("[user] unwrenches [src].", \
"You unwrench [src].")
- else if(istype(O, /obj/item/weapon/wirecutters) && unwrenchable)
+ else if(iswirecutter(O) && wrenchable)
using_irrigation = !using_irrigation
playsound(src, 'sound/items/Wirecutter.ogg', 50, 1)
user.visible_message("[user] [using_irrigation ? "" : "dis"]connects [src]'s irrigation hoses.", \
@@ -872,7 +866,7 @@
for(var/obj/machinery/hydroponics/h in range(1,src))
h.update_icon()
- else if(istype(O, /obj/item/weapon/shovel/spade) && unwrenchable)
+ else if(istype(O, /obj/item/weapon/shovel/spade))
if(!myseed && !weedlevel)
to_chat(user, "[src] doesn't have any plants or weeds!")
return
@@ -972,7 +966,7 @@
icon_state = "soil"
density = 0
use_power = 0
- unwrenchable = 0
+ wrenchable = 0
/obj/machinery/hydroponics/soil/update_icon_hoses()
return // Has no hoses
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index 66d33875bfe..d35621e4c59 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -336,14 +336,14 @@
for(var/i in 1 to seed.growthstages)
if("[seed.icon_grow][i]" in states)
continue
- to_chat(world, "[seed.name] ([seed.type]) lacks the [seed.icon_grow][i] icon!")
+ log_runtime("[seed.name] ([seed.type]) lacks the [seed.icon_grow][i] icon!", src)
if(!(seed.icon_dead in states))
- to_chat(world, "[seed.name] ([seed.type]) lacks the [seed.icon_dead] icon!")
+ log_runtime("[seed.name] ([seed.type]) lacks the [seed.icon_dead] icon!", src)
if(seed.icon_harvest) // mushrooms have no grown sprites, same for items with no product
if(!(seed.icon_harvest in states))
- to_chat(world, "[seed.name] ([seed.type]) lacks the [seed.icon_harvest] icon!")
+ log_runtime("[seed.name] ([seed.type]) lacks the [seed.icon_harvest] icon!", src)
/obj/item/seeds/proc/randomize_stats()
set_lifespan(rand(25, 60))
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index 736173181b7..8685056d9d3 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -16,9 +16,10 @@
var/list/blend_items = list (
//Sheets
- /obj/item/stack/sheet/mineral/plasma = list("plasma" = 20),
+ /obj/item/stack/sheet/mineral/plasma = list("plasma_dust" = 20),
/obj/item/stack/sheet/metal = list("iron" = 20),
- /obj/item/stack/sheet/plasteel = list("iron" = 20, "plasma" = 20),
+ /obj/item/stack/rods = list("iron" = 10),
+ /obj/item/stack/sheet/plasteel = list("iron" = 20, "plasma_dust" = 20),
/obj/item/stack/sheet/wood = list("carbon" = 20),
/obj/item/stack/sheet/glass = list("silicon" = 20),
/obj/item/stack/sheet/rglass = list("silicon" = 20, "iron" = 20),
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 238647af56b..1e7e9b1674a 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -720,7 +720,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(b_type & AUTOLATHE) lathe_types += "Autolathe"
if(b_type & MECHFAB) lathe_types += "Mech Fabricator"
if(b_type & PODFAB) lathe_types += "Spacepod Fabricator"
- if(b_type & BIOGENERATOR) lathe_types += "Biogenerator
"
+ if(b_type & BIOGENERATOR) lathe_types += "Biogenerator"
var/list/materials = list()
disk_data["materials"] = materials
for(var/M in d_disk.blueprint.materials)