From 2bdfcc373888c2d23b3793410a04c4f6d077df9d Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 4 Sep 2019 18:14:42 -0400 Subject: [PATCH 1/2] Replaces capsule liquidfoods with MREs Hooray Variety! Still has some liquidfoods for dire emergencies. --- maps/submaps/shelters/shelter_1.dmm | 10 +++----- maps/submaps/shelters/shelter_2.dmm | 26 ++++++++++---------- maps/submaps/shelters/shelter_3.dmm | 38 ++++++++++++++++++++--------- 3 files changed, 43 insertions(+), 31 deletions(-) diff --git a/maps/submaps/shelters/shelter_1.dmm b/maps/submaps/shelters/shelter_1.dmm index 022f72ca251..46e59b1eac9 100644 --- a/maps/submaps/shelters/shelter_1.dmm +++ b/maps/submaps/shelters/shelter_1.dmm @@ -14,12 +14,10 @@ /area/survivalpod) "d" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, -/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, -/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/menu11, /obj/item/device/fbp_backup_cell, /obj/item/device/fbp_backup_cell, /obj/item/device/fbp_backup_cell, diff --git a/maps/submaps/shelters/shelter_2.dmm b/maps/submaps/shelters/shelter_2.dmm index f4579aa3240..8108f61a7ff 100644 --- a/maps/submaps/shelters/shelter_2.dmm +++ b/maps/submaps/shelters/shelter_2.dmm @@ -14,7 +14,7 @@ pixel_x = 7; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/food/snacks/generalschicken, +/obj/random/mre, /obj/item/weapon/material/kitchen/utensil/fork{ pixel_x = 12 }, @@ -32,18 +32,18 @@ /area/survivalpod) "f" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, -/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, -/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, -/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, -/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, -/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, /obj/item/device/fbp_backup_cell, /obj/item/device/fbp_backup_cell, /obj/item/device/fbp_backup_cell, diff --git a/maps/submaps/shelters/shelter_3.dmm b/maps/submaps/shelters/shelter_3.dmm index c288aa97023..c631e608917 100644 --- a/maps/submaps/shelters/shelter_3.dmm +++ b/maps/submaps/shelters/shelter_3.dmm @@ -31,18 +31,32 @@ /area/survivalpod) "f" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, -/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, -/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, -/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, -/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, -/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, /obj/item/device/fbp_backup_cell, /obj/item/device/fbp_backup_cell, /obj/item/device/fbp_backup_cell, From 0397256a8d88fa89ca2709f8d25afc517639b6c6 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 4 Sep 2019 18:18:21 -0400 Subject: [PATCH 2/2] Sneaks in sleeper fix --- code/game/machinery/Sleeper.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index d12a03c9318..8de9b1c44cc 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -273,9 +273,6 @@ var/pumped = 0 for(var/datum/reagent/x in occupant.ingested.reagent_list) occupant.ingested.trans_to_obj(beaker, 3) - pumped++ - if(ishuman(occupant)) - occupant.ingested.trans_to_obj(beaker, pumped + 1) else toggle_pump()