From 5e181fb78b7990d24772ec332fed8abca7433cf1 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 14 May 2022 19:13:45 +1000 Subject: [PATCH] Fixes runtimes being broken. Removes back-worn watertanks. NO I DO NOT KNOW HOW IT IS RELATED IT JUST IS --- code/datums/supplypacks/atmospherics.dm | 4 ++-- code/datums/supplypacks/security.dm | 4 ++-- .../crates_lockers/closets/utility_closets.dm | 2 +- code/modules/economy/vending_machines.dm | 4 +--- code/modules/hydroponics/backtank.dm | 14 +++++++++++++- vorestation.dme | 1 - 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/code/datums/supplypacks/atmospherics.dm b/code/datums/supplypacks/atmospherics.dm index a18b6308923..e6fb05f2207 100644 --- a/code/datums/supplypacks/atmospherics.dm +++ b/code/datums/supplypacks/atmospherics.dm @@ -106,7 +106,7 @@ cost = 35 containertype = /obj/structure/closet/crate/aether containername = "Emergency crate" - +/* /datum/supply_pack/atmos/firefighting name = "Firefighting equipment" contains = list( @@ -118,4 +118,4 @@ ) cost = 35 containertype = /obj/structure/closet/crate/aether - containername = "Firefighting crate" \ No newline at end of file + containername = "Firefighting crate"*/ \ No newline at end of file diff --git a/code/datums/supplypacks/security.dm b/code/datums/supplypacks/security.dm index 18cc82af767..5c4ddf1a6a2 100644 --- a/code/datums/supplypacks/security.dm +++ b/code/datums/supplypacks/security.dm @@ -287,7 +287,7 @@ containertype = /obj/structure/closet/crate/secure/lawson containername = "Riot armor crate" access = access_armory - +/* /datum/supply_pack/security/riot_sprayer name = "Gear - Riot sprayer" contains = list( @@ -296,7 +296,7 @@ cost = 40 containertype = /obj/structure/closet/crate/secure/lawson containername = "Riot sprayer crate" - access = access_armory + access = access_armory*/ /datum/supply_pack/security/ablative_armor name = "Armor - Ablative" diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index aaf93580fff..c83dbe0f1a1 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -97,7 +97,7 @@ starts_with = list( /obj/item/clothing/suit/fire/heavy, /obj/item/weapon/tank/oxygen/red, - /obj/item/weapon/watertank/atmos, + /obj/item/weapon/extinguisher/atmo, /obj/item/device/flashlight, /obj/item/clothing/head/hardhat/firefighter/atmos) diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index d0ef6be1eb0..53cdabb65ad 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -487,7 +487,6 @@ /obj/item/weapon/plantspray/pests = 20, /obj/item/weapon/reagent_containers/syringe = 5, /obj/item/weapon/reagent_containers/glass/beaker = 4, - /obj/item/weapon/watertank = 1, /obj/item/weapon/storage/bag/plants = 5) premium = list(/obj/item/weapon/reagent_containers/glass/bottle/ammonia = 10, /obj/item/weapon/reagent_containers/glass/bottle/diethylamine = 5) @@ -1524,8 +1523,7 @@ /obj/item/clothing/gloves/black = 5, /obj/item/weapon/storage/belt/janitor = 5, /obj/item/clothing/shoes/galoshes = 5, - /obj/item/weapon/cartridge/janitor = 5, - /obj/item/weapon/watertank/janitor = 1 + /obj/item/weapon/cartridge/janitor = 5 ) req_log_access = access_hop has_logs = 1 diff --git a/code/modules/hydroponics/backtank.dm b/code/modules/hydroponics/backtank.dm index 9ecb6b7bb5c..c7c4f8677ea 100644 --- a/code/modules/hydroponics/backtank.dm +++ b/code/modules/hydroponics/backtank.dm @@ -1,3 +1,15 @@ +///// __ __ _____ _ _ _____ _ _ _____ ///// +///// \ \ / /\ | __ \| \ | |_ _| \ | |/ ____|///// +///// \ \ /\ / / \ | |__) | \| | | | | \| | | __ ///// +///// \ \/ \/ / /\ \ | _ /| . ` | | | | . ` | | |_ |///// +///// \ /\ / ____ \| | \ \| |\ |_| |_| |\ | |__| |///// +///// \/ \/_/ \_\_| \_\_| \_|_____|_| \_|\_____|///// + + +///// I have no clue why. I am too tired to figure out. Do not enable this file. For some esoteric reasons it breaks runtimes. Particularly, runtime logging. +///// No I don't know why. No I don't care to figure out why. Not anymore. I haven't seen these things used anywhere. By anyone. +///// If somebody REALLY wants these, they can be the ones to figure out why the hell this random-ass water backpack file breaks runtime list. I am disabling this and I am done with this. Good night. + /* * Hydroponics tank and base code */ @@ -17,7 +29,7 @@ /obj/item/weapon/watertank/Initialize() . = ..() - create_reagents(volume, OPENCONTAINER) + create_reagents(volume) noz = make_noz() /obj/item/weapon/watertank/MouseDrop() diff --git a/vorestation.dme b/vorestation.dme index 40d0515ef90..2708c3cc4a3 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2378,7 +2378,6 @@ #include "code\modules\holomap\holomap_datum.dm" #include "code\modules\holomap\mapper.dm" #include "code\modules\holomap\station_holomap.dm" -#include "code\modules\hydroponics\backtank.dm" #include "code\modules\hydroponics\grown.dm" #include "code\modules\hydroponics\grown_inedible.dm" #include "code\modules\hydroponics\grown_predefined.dm"