mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-26 21:49:11 +01:00
Merge remote-tracking branch 'VOREStation/master' into medbeam
This commit is contained in:
Unknown
@@ -65,6 +65,21 @@
|
||||
prob(10);/obj/effect/mine/stun,
|
||||
prob(10);/obj/effect/mine/incendiary,)
|
||||
|
||||
/obj/random/humanoidremains
|
||||
name = "Random Humanoid Remains"
|
||||
desc = "This is a random pile of remains."
|
||||
spawn_nothing_percentage = 15
|
||||
icon = 'icons/effects/blood.dmi'
|
||||
icon_state = "remains"
|
||||
|
||||
/obj/random/humanoidremains/item_to_spawn()
|
||||
return pick(prob(30);/obj/effect/decal/remains/human,
|
||||
prob(25);/obj/effect/decal/remains/ribcage,
|
||||
prob(25);/obj/effect/decal/remains/tajaran,
|
||||
prob(10);/obj/effect/decal/remains/unathi,
|
||||
prob(10);/obj/effect/decal/remains/posi
|
||||
)
|
||||
|
||||
/obj/random_multi/single_item/captains_spare_id
|
||||
name = "Multi Point - Captain's Spare"
|
||||
id = "Captain's spare id"
|
||||
@@ -396,5 +411,54 @@
|
||||
/obj/item/clothing/mask/luchador/rudos,
|
||||
/obj/item/clothing/mask/luchador/tecnicos,
|
||||
/obj/structure/closet/crate
|
||||
),
|
||||
prob(1);list(
|
||||
/obj/machinery/artifact,
|
||||
/obj/structure/anomaly_container
|
||||
),
|
||||
prob(1);list(
|
||||
/obj/random/curseditem,
|
||||
/obj/random/humanoidremains,
|
||||
/obj/structure/closet/crate
|
||||
)
|
||||
)
|
||||
|
||||
/*
|
||||
* Turf swappers.
|
||||
*/
|
||||
|
||||
/obj/random/turf
|
||||
name = "random Sif turf"
|
||||
desc = "This is a random Sif turf."
|
||||
|
||||
spawn_nothing_percentage = 20
|
||||
|
||||
var/override_outdoors = FALSE // Do we override our chosen turf's outdoors?
|
||||
var/turf_outdoors = TRUE // Will our turf be outdoors?
|
||||
|
||||
/obj/random/turf/spawn_item()
|
||||
var/build_path = item_to_spawn()
|
||||
|
||||
var/turf/T1 = get_turf(src)
|
||||
T1.ChangeTurf(build_path, 1, 1, FALSE)
|
||||
|
||||
if(override_outdoors)
|
||||
T1.outdoors = turf_outdoors
|
||||
|
||||
/obj/random/turf/item_to_spawn()
|
||||
return pick(prob(25);/turf/simulated/floor/outdoors/grass/sif,
|
||||
prob(25);/turf/simulated/floor/outdoors/dirt,
|
||||
prob(25);/turf/simulated/floor/outdoors/grass/sif/forest,
|
||||
prob(25);/turf/simulated/floor/outdoors/rocks)
|
||||
|
||||
/obj/random/turf/lava
|
||||
name = "random Lava spawn"
|
||||
desc = "This is a random lava spawn."
|
||||
|
||||
override_outdoors = TRUE
|
||||
turf_outdoors = FALSE
|
||||
|
||||
/obj/random/turf/lava/item_to_spawn()
|
||||
return pick(prob(5);/turf/simulated/floor/lava,
|
||||
prob(3);/turf/simulated/floor/outdoors/rocks/caves,
|
||||
prob(1);/turf/simulated/mineral)
|
||||
|
||||
@@ -530,3 +530,161 @@
|
||||
|
||||
/obj/random/janusmodule/item_to_spawn()
|
||||
return pick(subtypesof(/obj/item/weapon/circuitboard/mecha/imperion))
|
||||
|
||||
/obj/random/curseditem
|
||||
name = "random cursed item"
|
||||
desc = "For use in dungeons."
|
||||
icon = 'icons/obj/storage.dmi'
|
||||
icon_state = "red"
|
||||
|
||||
/obj/random/curseditem/item_to_spawn()
|
||||
var/possible_object_paths = list(/obj/item/weapon/paper/carbon/cursedform)
|
||||
possible_object_paths |= subtypesof(/obj/item/clothing/head/psy_crown)
|
||||
return pick(possible_object_paths)
|
||||
|
||||
//Random MRE stuff
|
||||
|
||||
/obj/random/mre
|
||||
name = "random MRE"
|
||||
desc = "This is a random single MRE."
|
||||
icon = 'icons/obj/food.dmi'
|
||||
icon_state = "mre"
|
||||
drop_get_turf = FALSE
|
||||
|
||||
/obj/random/mre/item_to_spawn()
|
||||
return pick(/obj/item/weapon/storage/mre,
|
||||
/obj/item/weapon/storage/mre/menu2,
|
||||
/obj/item/weapon/storage/mre/menu3,
|
||||
/obj/item/weapon/storage/mre/menu4,
|
||||
/obj/item/weapon/storage/mre/menu5,
|
||||
/obj/item/weapon/storage/mre/menu6,
|
||||
/obj/item/weapon/storage/mre/menu7,
|
||||
/obj/item/weapon/storage/mre/menu8,
|
||||
/obj/item/weapon/storage/mre/menu9,
|
||||
/obj/item/weapon/storage/mre/menu10)
|
||||
|
||||
|
||||
/obj/random/mre/main
|
||||
name = "random MRE main course"
|
||||
desc = "This is a random main course for MREs."
|
||||
icon_state = "pouch"
|
||||
drop_get_turf = FALSE
|
||||
|
||||
/obj/random/mre/main/item_to_spawn()
|
||||
return pick(/obj/item/weapon/storage/mrebag,
|
||||
/obj/item/weapon/storage/mrebag/menu2,
|
||||
/obj/item/weapon/storage/mrebag/menu3,
|
||||
/obj/item/weapon/storage/mrebag/menu4,
|
||||
/obj/item/weapon/storage/mrebag/menu5,
|
||||
/obj/item/weapon/storage/mrebag/menu6,
|
||||
/obj/item/weapon/storage/mrebag/menu7,
|
||||
/obj/item/weapon/storage/mrebag/menu8)
|
||||
|
||||
/obj/random/mre/side
|
||||
name = "random MRE side dish"
|
||||
desc = "This is a random side dish for MREs."
|
||||
icon_state = "pouch"
|
||||
drop_get_turf = FALSE
|
||||
|
||||
/obj/random/mre/side/item_to_spawn()
|
||||
return pick(/obj/item/weapon/reagent_containers/food/snacks/tossedsalad,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/boiledrice,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/poppypretzel,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/twobread,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast)
|
||||
|
||||
/obj/random/mre/dessert
|
||||
name = "random MRE dessert"
|
||||
desc = "This is a random dessert for MREs."
|
||||
icon_state = "pouch"
|
||||
drop_get_turf = FALSE
|
||||
|
||||
/obj/random/mre/dessert/item_to_spawn()
|
||||
return pick(/obj/item/weapon/reagent_containers/food/snacks/candy,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/donut/normal,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/cookie)
|
||||
|
||||
/obj/random/mre/dessert/vegan
|
||||
name = "random vegan MRE dessert"
|
||||
desc = "This is a random vegan dessert for MREs."
|
||||
|
||||
/obj/random/mre/dessert/vegan/item_to_spawn()
|
||||
return pick(/obj/item/weapon/reagent_containers/food/snacks/candy,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit)
|
||||
|
||||
/obj/random/mre/drink
|
||||
name = "random MRE drink"
|
||||
desc = "This is a random drink for MREs."
|
||||
icon_state = "packet"
|
||||
drop_get_turf = FALSE
|
||||
|
||||
/obj/random/mre/drink/item_to_spawn()
|
||||
return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/coffee,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/tea,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/cocoa,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/grape,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/orange,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/watermelon,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/apple)
|
||||
|
||||
/obj/random/mre/spread
|
||||
name = "random MRE spread"
|
||||
desc = "This is a random spread packet for MREs."
|
||||
icon_state = "packet"
|
||||
drop_get_turf = FALSE
|
||||
|
||||
/obj/random/mre/spread/item_to_spawn()
|
||||
return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/jelly,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/honey)
|
||||
|
||||
/obj/random/mre/spread/vegan
|
||||
name = "random vegan MRE spread"
|
||||
desc = "This is a random vegan spread packet for MREs"
|
||||
|
||||
/obj/random/mre/spread/vegan/item_to_spawn()
|
||||
return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/jelly)
|
||||
|
||||
/obj/random/mre/sauce
|
||||
name = "random MRE sauce"
|
||||
desc = "This is a random sauce packet for MREs."
|
||||
icon_state = "packet"
|
||||
drop_get_turf = FALSE
|
||||
|
||||
/obj/random/mre/sauce/item_to_spawn()
|
||||
return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/salt,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/pepper,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/sugar,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/capsaicin,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/ketchup,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/mayo,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/soy)
|
||||
|
||||
/obj/random/mre/sauce/vegan/item_to_spawn()
|
||||
return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/salt,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/pepper,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/sugar,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/soy)
|
||||
|
||||
/obj/random/mre/sauce/sugarfree/item_to_spawn()
|
||||
return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/salt,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/pepper,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/capsaicin,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/ketchup,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/mayo,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/soy)
|
||||
|
||||
/obj/random/mre/sauce/crayon/item_to_spawn()
|
||||
return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/generic,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/red,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/orange,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/yellow,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/green,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/blue,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/purple,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/grey,
|
||||
/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/brown)
|
||||
|
||||
@@ -229,3 +229,6 @@
|
||||
prob(50);/obj/random/soap,
|
||||
prob(60);/obj/random/drinkbottle,
|
||||
prob(500);/obj/random/maintenance/clean)
|
||||
|
||||
/obj/random/action_figure/supplypack
|
||||
drop_get_turf = FALSE
|
||||
Reference in New Issue
Block a user