Merge pull request #4409 from Novacat/nova-pathfinder

Shelter Capsule Content Tweaks
This commit is contained in:
Spades
2018-12-08 09:42:18 -05:00
committed by GitHub
3 changed files with 35 additions and 21 deletions

View File

@@ -209,25 +209,13 @@
light_power = 1.2 light_power = 1.2
light_color = "#DDFFD3" light_color = "#DDFFD3"
pixel_y = -4 pixel_y = -4
max_n_of_items = 10 max_n_of_items = 100
var/empty = FALSE
/obj/machinery/smartfridge/survival_pod/initialize(mapload) /obj/machinery/smartfridge/survival_pod/initialize()
. = ..() . = ..()
if(empty) for(var/obj/item/O in loc)
return if(accept_check(O))
for(var/i in 1 to 5) stock(O)
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)
/obj/machinery/smartfridge/survival_pod/accept_check(obj/item/O) /obj/machinery/smartfridge/survival_pod/accept_check(obj/item/O)
return isitem(O) return isitem(O)
@@ -235,7 +223,6 @@
/obj/machinery/smartfridge/survival_pod/empty /obj/machinery/smartfridge/survival_pod/empty
name = "dusty survival pod storage" name = "dusty survival pod storage"
desc = "A heated storage unit. This one's seen better days." desc = "A heated storage unit. This one's seen better days."
empty = TRUE
//Fans //Fans
/obj/structure/fans /obj/structure/fans

View File

@@ -14,6 +14,17 @@
/area/survivalpod) /area/survivalpod)
"d" = ( "d" = (
/obj/machinery/smartfridge/survival_pod, /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/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/weapon/storage/pill_bottle/dice,
/turf/simulated/shuttle/floor/voidcraft, /turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod) /area/survivalpod)
"e" = ( "e" = (

View File

@@ -32,6 +32,24 @@
/area/survivalpod) /area/survivalpod)
"f" = ( "f" = (
/obj/machinery/smartfridge/survival_pod, /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/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/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/weapon/storage/pill_bottle/antitox,
/obj/item/device/healthanalyzer,
/obj/item/weapon/storage/pill_bottle/dice_nerd,
/turf/simulated/shuttle/floor/voidcraft, /turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod) /area/survivalpod)
"g" = ( "g" = (
@@ -87,9 +105,7 @@
/area/survivalpod) /area/survivalpod)
"p" = ( "p" = (
/obj/structure/table/survival_pod, /obj/structure/table/survival_pod,
/obj/item/weapon/storage/firstaid/adv{ /obj/item/weapon/storage/firstaid/adv,
pixel_x = 4
},
/turf/simulated/shuttle/floor/voidcraft, /turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod) /area/survivalpod)
"q" = ( "q" = (