cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 04:28:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5803 from Novacat/nova-pathfinder

Browse Source 
Replaces capsule liquidfoods with MREs
This commit is contained in:
Novacat
2019-09-04 19:29:26 -04:00
committed by GitHub
parent 12c799371b 0397256a8d
commit 625f108355
4 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/Sleeper.dm
-3
View File
@@ -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()
maps/submaps/shelters/shelter_1.dmm
+4 -6
View File
@@ -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,
maps/submaps/shelters/shelter_2.dmm
+13 -13
View File
@@ -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,
maps/submaps/shelters/shelter_3.dmm
+26 -12
View File
@@ -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,