cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hawk_v3
2018-12-09 19:45:43 +00:00
parent f317802ada 5fe51f64ad
commit 300d9086e2
32 changed files with 534 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
code/modules/mining/shelter_atoms.dm
View File

@@ -209,25 +209,13 @@
light_power = 1.2
light_color = "#DDFFD3"
pixel_y = -4
max_n_of_items = 10
var/empty = FALSE
max_n_of_items = 100
/obj/machinery/smartfridge/survival_pod/initialize(mapload)
/obj/machinery/smartfridge/survival_pod/initialize()
. = ..()
if(empty)
return
for(var/i in 1 to 5)
var/obj/item/weapon/reagent_containers/food/snacks/liquidfood/W = new(src)
stock(W)
for(var/i in 1 to 2)
var/obj/item/device/fbp_backup_cell/W = new(src)
stock(W)
if(prob(50))
var/obj/item/weapon/storage/pill_bottle/dice/D = new(src)
stock(D)
else
var/obj/item/device/instrument/violin/V = new(src)
stock(V)
for(var/obj/item/O in loc)
if(accept_check(O))
stock(O)
/obj/machinery/smartfridge/survival_pod/accept_check(obj/item/O)
return isitem(O)
@@ -235,7 +223,6 @@
/obj/machinery/smartfridge/survival_pod/empty
name = "dusty survival pod storage"
desc = "A heated storage unit. This one's seen better days."
empty = TRUE
//Fans
/obj/structure/fans