Merge pull request #12968 from Heroman3003/RUNTIME-FIX-END-ME

Fixes runtimes being broken. Removes back-worn watertanks. NO I DO NO…
This commit is contained in:
Novacat
2022-05-14 09:05:16 -04:00
committed by GitHub
6 changed files with 19 additions and 10 deletions
+2 -2
View File
@@ -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"
containername = "Firefighting crate"*/
+2 -2
View File
@@ -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"
@@ -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)
+1 -3
View File
@@ -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
+13 -1
View File
@@ -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()
-1
View File
@@ -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"