diff --git a/baystation12.dme b/baystation12.dme
index 93e5a8e08a7..0b0ee50ef90 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -963,8 +963,8 @@
#include "code\modules\hydroponics\seed_datums.dm"
#include "code\modules\hydroponics\seed_machines.dm"
#include "code\modules\hydroponics\seed_mobs.dm"
-#include "code\modules\hydroponics\seed_storage.dm"
#include "code\modules\hydroponics\seed_packets.dm"
+#include "code\modules\hydroponics\seed_storage.dm"
#include "code\modules\hydroponics\spreading\spreading.dm"
#include "code\modules\hydroponics\spreading\spreading_growth.dm"
#include "code\modules\hydroponics\spreading\spreading_response.dm"
diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm
index 3dc7a9429e2..991fecc88b8 100644
--- a/code/modules/hydroponics/grown_inedible.dm
+++ b/code/modules/hydroponics/grown_inedible.dm
@@ -39,7 +39,6 @@
icon = 'icons/obj/harvest.dmi'
icon_state = "logs"
force = 5
- flags = TABLEPASS
throwforce = 5
w_class = 3.0
throw_speed = 3
diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm
index 17cab40d8a1..a47b0dc0461 100644
--- a/code/modules/hydroponics/seed_storage.dm
+++ b/code/modules/hydroponics/seed_storage.dm
@@ -59,7 +59,7 @@
for(var/typepath in starting_seeds)
var/amount = starting_seeds[typepath]
if(isnull(amount)) amount = 1
-
+
for (var/i = 1 to amount)
var/O = new typepath
add(O)
@@ -121,7 +121,7 @@
dat += "| Norm | "
else
dat += "No | "
-
+
dat += ""
if ("mutants" in scanner)
if(seed.mutants && seed.mutants.len)
diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm
index e60b825278c..99b8ea8c7dc 100644
--- a/code/modules/hydroponics/spreading/spreading.dm
+++ b/code/modules/hydroponics/spreading/spreading.dm
@@ -48,7 +48,6 @@
var/list/children = list()
var/obj/effect/plant/parent
- var/mob/living/buckled_mob
var/datum/seed/seed
var/floor = 0
var/spread_chance = 40
diff --git a/code/modules/hydroponics/trays/tray_reagents.dm b/code/modules/hydroponics/trays/tray_reagents.dm
index 940a6fb01a7..3dad0adc451 100644
--- a/code/modules/hydroponics/trays/tray_reagents.dm
+++ b/code/modules/hydroponics/trays/tray_reagents.dm
@@ -2,7 +2,7 @@
/obj/item/weapon/plantspray
icon = 'icons/obj/hydroponics_machines.dmi'
item_state = "spray"
- flags = TABLEPASS | FPRINT | NOBLUDGEON
+ flags = NOBLUDGEON
slot_flags = SLOT_BELT
throwforce = 4
w_class = 2.0
@@ -54,7 +54,7 @@
icon = 'icons/obj/weapons.dmi'
icon_state = "hoe"
item_state = "hoe"
- flags = FPRINT | TABLEPASS | CONDUCT | NOBLUDGEON
+ flags = CONDUCT | NOBLUDGEON
force = 5.0
throwforce = 7.0
w_class = 2.0
@@ -70,7 +70,6 @@
name = "bottle of weedkiller"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
- flags = FPRINT | TABLEPASS
var/toxicity = 0
var/weed_kill_str = 0
@@ -78,7 +77,6 @@
name = "bottle of glyphosate"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
- flags = FPRINT | TABLEPASS
toxicity = 4
weed_kill_str = 2
@@ -86,7 +84,6 @@
name = "bottle of triclopyr"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle18"
- flags = FPRINT | TABLEPASS
toxicity = 6
weed_kill_str = 4
@@ -94,11 +91,9 @@
name = "bottle of 2,4-D"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle15"
- flags = FPRINT | TABLEPASS
toxicity = 8
weed_kill_str = 7
-
// *************************************
// Nutrient defines for hydroponics
// *************************************
@@ -108,7 +103,7 @@
desc = "A small glass bottle. Can hold up to 10 units."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
- flags = FPRINT | TABLEPASS | OPENCONTAINER
+ flags = OPENCONTAINER
possible_transfer_amounts = null
w_class = 2.0
diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm
index d4b1777e549..404abb707c6 100644
--- a/code/modules/hydroponics/trays/tray_tools.dm
+++ b/code/modules/hydroponics/trays/tray_tools.dm
@@ -205,59 +205,6 @@
return
-// *************************************
-// Hydroponics Tools
-// *************************************
-
-/obj/item/weapon/plantspray
- icon = 'icons/obj/hydroponics_machines.dmi'
- item_state = "spray"
- flags = NOBLUDGEON
- slot_flags = SLOT_BELT
- throwforce = 4
- w_class = 2.0
- throw_speed = 2
- throw_range = 10
- var/toxicity = 4
- var/pest_kill_str = 0
- var/weed_kill_str = 0
-
-/obj/item/weapon/plantspray/weeds // -- Skie
-
- name = "weed-spray"
- desc = "It's a toxic mixture, in spray form, to kill small weeds."
- icon_state = "weedspray"
- weed_kill_str = 6
-
-/obj/item/weapon/plantspray/pests
- name = "pest-spray"
- desc = "It's some pest eliminator spray! Do not inhale!"
- icon_state = "pestspray"
- pest_kill_str = 6
-
-/obj/item/weapon/plantspray/pests/old
- name = "bottle of pestkiller"
- icon = 'icons/obj/chemical.dmi'
- icon_state = "bottle16"
-
-/obj/item/weapon/plantspray/pests/old/carbaryl
- name = "bottle of carbaryl"
- icon_state = "bottle16"
- toxicity = 4
- pest_kill_str = 2
-
-/obj/item/weapon/plantspray/pests/old/lindane
- name = "bottle of lindane"
- icon_state = "bottle18"
- toxicity = 6
- pest_kill_str = 4
-
-/obj/item/weapon/plantspray/pests/old/phosmet
- name = "bottle of phosmet"
- icon_state = "bottle15"
- toxicity = 8
- pest_kill_str = 7
-
/obj/item/weapon/minihoe // -- Numbers
name = "mini hoe"
desc = "It's used for removing weeds or scratching your back."
@@ -271,83 +218,6 @@
matter = list("metal" = 50)
attack_verb = list("slashed", "sliced", "cut", "clawed")
-
-// *************************************
-// Weedkiller defines for hydroponics
-// *************************************
-
-/obj/item/weedkiller
- name = "bottle of weedkiller"
- icon = 'icons/obj/chemical.dmi'
- icon_state = "bottle16"
- var/toxicity = 0
- var/weed_kill_str = 0
-
-/obj/item/weedkiller/triclopyr
- name = "bottle of glyphosate"
- icon = 'icons/obj/chemical.dmi'
- icon_state = "bottle16"
- toxicity = 4
- weed_kill_str = 2
-
-/obj/item/weedkiller/lindane
- name = "bottle of triclopyr"
- icon = 'icons/obj/chemical.dmi'
- icon_state = "bottle18"
- toxicity = 6
- weed_kill_str = 4
-
-/obj/item/weedkiller/D24
- name = "bottle of 2,4-D"
- icon = 'icons/obj/chemical.dmi'
- icon_state = "bottle15"
- toxicity = 8
- weed_kill_str = 7
-
-
-// *************************************
-// Nutrient defines for hydroponics
-// *************************************
-
-/obj/item/weapon/reagent_containers/glass/fertilizer
- name = "fertilizer bottle"
- desc = "A small glass bottle. Can hold up to 10 units."
- icon = 'icons/obj/chemical.dmi'
- icon_state = "bottle16"
- flags = OPENCONTAINER
- possible_transfer_amounts = null
- w_class = 2.0
-
- var/fertilizer //Reagent contained, if any.
-
- //Like a shot glass!
- amount_per_transfer_from_this = 10
- volume = 10
-
-/obj/item/weapon/reagent_containers/glass/fertilizer/New()
- ..()
-
- src.pixel_x = rand(-5.0, 5)
- src.pixel_y = rand(-5.0, 5)
-
- if(fertilizer)
- reagents.add_reagent(fertilizer,10)
-
-/obj/item/weapon/reagent_containers/glass/fertilizer/ez
- name = "bottle of E-Z-Nutrient"
- icon_state = "bottle16"
- fertilizer = "eznutrient"
-
-/obj/item/weapon/reagent_containers/glass/fertilizer/l4z
- name = "bottle of Left 4 Zed"
- icon_state = "bottle18"
- fertilizer = "left4zed"
-
-/obj/item/weapon/reagent_containers/glass/fertilizer/rh
- name = "bottle of Robust Harvest"
- icon_state = "bottle15"
- fertilizer = "robustharvest"
-
//Hatchets and things to kill kudzu
/obj/item/weapon/hatchet
name = "hatchet"
diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm
index c5f4c2d2dd4..9b4c660e76b 100644
--- a/code/modules/mining/abandonedcrates.dm
+++ b/code/modules/mining/abandonedcrates.dm
@@ -13,19 +13,18 @@
/obj/structure/closet/crate/secure/loot/New()
..()
var/list/digits = list("1", "2", "3", "4", "5", "6", "7", "8", "9", "0")
-
+
code = ""
for(var/i = 0, i < codelen, i++)
var/dig = pick(digits)
code += dig
digits -= dig // Player can enter codes with matching digits, but there are never matching digits in the answer
-
+
var/loot = rand(1, 100)
switch(loot)
if(1 to 5) // Common things go, 5%
new/obj/item/weapon/reagent_containers/food/drinks/bottle/rum(src)
new/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey(src)
- new/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus(src)
new/obj/item/weapon/flame/lighter/zippo(src)
if(6 to 10)
new/obj/item/weapon/pickaxe/drill(src)
|