mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-24 21:57:53 +01:00
Merge branch 'master' of https://github.com/CHOMPStation2/CHOMPStation2 into non-crew-role
This commit is contained in:
@@ -0,0 +1,16 @@
|
||||
/datum/supply_pack/supply/capcrystal
|
||||
name = "Capture Crystal crate"
|
||||
contains = list(/obj/item/capture_crystal)
|
||||
cost = 500
|
||||
containertype = /obj/structure/closet/crate
|
||||
containername = "Capture Crystal crate"
|
||||
contraband = 1
|
||||
|
||||
/datum/supply_pack/supply/chemistrykitbundle
|
||||
name = "gender and size chemistry bundle kit"
|
||||
contains = list(/obj/item/selectable_item/chemistrykit/size = 3,
|
||||
/obj/item/selectable_item/chemistrykit/gender = 3)
|
||||
cost = 100
|
||||
containertype = /obj/structure/closet/crate
|
||||
containername = "gender and size chemistry bundle crate"
|
||||
contraband = 1
|
||||
@@ -0,0 +1,6 @@
|
||||
/datum/supply_pack/eng/engine/rotary_wheel
|
||||
contains = list(/obj/item/weapon/circuitboard/machine/reg_c)
|
||||
name = "c-type rotary electric generator board"
|
||||
containertype = /obj/structure/closet/crate/focalpoint
|
||||
containername = "c-type rotary board crate"
|
||||
access = access_engine
|
||||
@@ -0,0 +1,18 @@
|
||||
/datum/supply_pack/hydro/teppi
|
||||
name = "Teppi crate"
|
||||
cost = 60 //considering a corgi crate is 50, and you get two fennecs
|
||||
containertype = /obj/structure/largecrate/animal/teppi
|
||||
containername = "Teppi crate"
|
||||
|
||||
/datum/supply_pack/hydro/sheep
|
||||
name = "Sheep crate"
|
||||
cost = 25
|
||||
containertype = /obj/structure/largecrate/animal/sheep
|
||||
containername = "Goat crate"
|
||||
access = access_hydroponics
|
||||
|
||||
/datum/supply_pack/hydro/woofdog
|
||||
name = "Dog crate"
|
||||
cost = 50
|
||||
containertype = /obj/structure/largecrate/animal/woofdog
|
||||
containername = "Dog carrier"
|
||||
@@ -3,4 +3,11 @@
|
||||
contains = list(/obj/item/weapon/backup_implanter = 4)
|
||||
cost = 50
|
||||
containertype = /obj/structure/closet/crate/medical
|
||||
containername = "Spare backup implanters"
|
||||
containername = "Spare backup implanters"
|
||||
|
||||
/datum/supply_pack/med/decrotizer
|
||||
name = "Commercial Denecrotizer "
|
||||
contains = list(/obj/item/device/denecrotizer/medical)
|
||||
cost = 40
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "commercial denecrotizer crate"
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
/datum/supply_pack/sci/pred_sect
|
||||
name = "EXTREMELY Dangerous Bug"
|
||||
cost = 200
|
||||
containertype = /obj/structure/largecrate/animal/bugsect
|
||||
containername = "EXTREMELY Dangerous Bug crate"
|
||||
contraband = 1
|
||||
access = access_xenobiology
|
||||
@@ -0,0 +1,125 @@
|
||||
// Unique areas were requested for each superpose map for future use. The plain superpose area is for future varedits to all superpose submaps.
|
||||
/area/survivalpod/superpose
|
||||
|
||||
/area/survivalpod/superpose/CrashedInfestedShip
|
||||
|
||||
/area/survivalpod/superpose/CrashedQurantineShip
|
||||
|
||||
/area/survivalpod/superpose/CultShip
|
||||
|
||||
/area/survivalpod/superpose/DemonPool
|
||||
|
||||
/area/survivalpod/superpose/Dinner
|
||||
|
||||
/area/survivalpod/superpose/ExplorerHome
|
||||
|
||||
/area/survivalpod/superpose/Farm
|
||||
|
||||
/area/survivalpod/superpose/FieldLab
|
||||
|
||||
/area/survivalpod/superpose/HellCave
|
||||
|
||||
/area/survivalpod/superpose/HydroCave
|
||||
|
||||
/area/survivalpod/superpose/LargeAlienShip
|
||||
|
||||
/area/survivalpod/superpose/LoneHome
|
||||
|
||||
/area/survivalpod/superpose/MechFabShip
|
||||
|
||||
/area/survivalpod/superpose/MechStorageFab
|
||||
|
||||
/area/survivalpod/superpose/MercShip
|
||||
|
||||
/area/survivalpod/superpose/MethLab
|
||||
|
||||
/area/survivalpod/superpose/OldHotel
|
||||
|
||||
/area/survivalpod/superpose/ScienceShip
|
||||
|
||||
/area/survivalpod/superpose/SmallCombatShip
|
||||
|
||||
/area/survivalpod/superpose/SurvivalBarracks
|
||||
|
||||
/area/survivalpod/superpose/SurvivalCargo
|
||||
|
||||
/area/survivalpod/superpose/SurvivalDIY_11x11
|
||||
|
||||
/area/survivalpod/superpose/SurvivalDIY_7x7
|
||||
|
||||
/area/survivalpod/superpose/SurvivalDIY_9x9
|
||||
|
||||
/area/survivalpod/superpose/SurvivalDinner
|
||||
|
||||
/area/survivalpod/superpose/SurvivalEngineering
|
||||
|
||||
/area/survivalpod/superpose/SurvivalHome
|
||||
|
||||
/area/survivalpod/superpose/SurvivalHydro
|
||||
|
||||
/area/survivalpod/superpose/SurvivalJanitor
|
||||
|
||||
/area/survivalpod/superpose/SurvivalLeisure
|
||||
|
||||
/area/survivalpod/superpose/SurvivalLuxuryBar
|
||||
|
||||
/area/survivalpod/superpose/SurvivalLuxuryHome
|
||||
|
||||
/area/survivalpod/superpose/SurvivalMedical
|
||||
|
||||
/area/survivalpod/superpose/SurvivalPool
|
||||
|
||||
/area/survivalpod/superpose/SurvivalQuarters
|
||||
|
||||
/area/survivalpod/superpose/SurvivalScience
|
||||
|
||||
/area/survivalpod/superpose/SurvivalSecurity
|
||||
|
||||
/area/survivalpod/superpose/TinyCombatShip
|
||||
|
||||
/area/survivalpod/superpose/TradingShip
|
||||
|
||||
/area/survivalpod/superpose/WoodenCamp
|
||||
|
||||
/obj/item/device/survivalcapsule/superpose
|
||||
name = "superposed surfluid shelter capsule"
|
||||
desc = "A proprietary hyperstructure of many three-dimensional spaces superposed around a supermatter nano crystal; use a pen to reach the reset button. There's a license for use printed on the bottom."
|
||||
description_info = "The capsule contains pockets of compressed space in a super position stabilized by a miniscule supermatter crystal. \
|
||||
NanoTrasen stresses the safety of this model over previous prototypes but assumes no liability for sub-kiloton explosions."
|
||||
template_id = null
|
||||
var/list/template_ids = list()
|
||||
var/pod_initialized = FALSE
|
||||
|
||||
// Override since the parent proc has a sanity check to delete the capsule if no template is found, which doesn't exactly work with this item considering examining calls this proc.
|
||||
/obj/item/device/survivalcapsule/superpose/get_template()
|
||||
if(template)
|
||||
return
|
||||
template = SSmapping.shelter_templates[template_id]
|
||||
if(!template)
|
||||
template = null
|
||||
|
||||
/obj/item/device/survivalcapsule/superpose/attack_self()
|
||||
if(!pod_initialized) // Populate list after round start as map templates might not exist when this item is created.
|
||||
for(var/datum/map_template/shelter/superpose/shelter_type as anything in subtypesof(/datum/map_template/shelter))
|
||||
if(!(initial(shelter_type.mappath)) || !(initial(shelter_type.superpose))) // Limits map templates to those marked for the superpose capsule.
|
||||
continue
|
||||
template_ids += initial(shelter_type.shelter_id)
|
||||
pod_initialized = TRUE
|
||||
if(!template_id)
|
||||
var/answer = tgui_input_list(usr, "Which template would you like to load?","Available Templates", template_ids)
|
||||
if(!answer)
|
||||
return
|
||||
else
|
||||
src.template_id = answer
|
||||
return // Return here or the pod will activate as soon as a selection is made.
|
||||
|
||||
// Now we call super to run the rest of the parent proc since the choice has been handled.
|
||||
..()
|
||||
|
||||
// Allows resetting the capsule if the wrong template is chosen.
|
||||
/obj/item/device/survivalcapsule/superpose/attackby(obj/item/W, mob/user)
|
||||
if(istype(W, /obj/item/weapon/pen) && !used)
|
||||
template_id = null
|
||||
template = null // Important to reset both, otherwise the template cannot be reset once the pod has been deployed.
|
||||
to_chat(user, "<span class='notice'>You reset the pod's selection.</span>")
|
||||
..()
|
||||
@@ -0,0 +1,249 @@
|
||||
/datum/map_template/shelter
|
||||
var/superpose = FALSE
|
||||
|
||||
// Subtype to mark maps for use with the superpose capsule. This is mostly to prevent automatic additions from upstream changes.
|
||||
/datum/map_template/shelter/superpose
|
||||
superpose = TRUE
|
||||
name = "ERROR: string 'name' cannot be null!"
|
||||
description = "ERROR: string 'description' cannot be null!"
|
||||
mappath = null
|
||||
|
||||
/datum/map_template/shelter/superpose/CrashedInfestedShip
|
||||
shelter_id = "CrashedInfestedShip"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/CrashedInfestedShip-60x29.dmm"
|
||||
name = "Crashed infested ship."
|
||||
description = "A large alien ship that is heavily damaged, there is signs of xeno infestation."
|
||||
|
||||
/datum/map_template/shelter/superpose/CrashedQurantineShip
|
||||
shelter_id = "CrashedQurantineShip"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/CrashedQurantineShip-25x25.dmm"
|
||||
name = "Crashed Qurantine Ship."
|
||||
description = "A white medical ship that is heavily damaged, there is signs of a viral outbreak."
|
||||
|
||||
/datum/map_template/shelter/superpose/CultShip
|
||||
shelter_id = "CultShip"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/CultShip-28x17.dmm"
|
||||
name = "Cultist ship."
|
||||
description = "A medium size cult themed ship, it has some basic cultist gear."
|
||||
|
||||
/datum/map_template/shelter/superpose/DemonPool
|
||||
shelter_id = "DemonPool"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/DemonPool-21x21.dmm"
|
||||
name = "Demon pool."
|
||||
description = "A large redspace corruption with lava, flesh tiles and a small cultist room in the middle."
|
||||
|
||||
/datum/map_template/shelter/superpose/Dinner
|
||||
shelter_id = "Dinner"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/Dinner-25x25.dmm"
|
||||
name = "Local diner."
|
||||
description = "A medium size diner with all kitchen appliances and food."
|
||||
|
||||
/datum/map_template/shelter/superpose/ExplorerHome
|
||||
shelter_id = "ExplorerHome"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/ExplorerHome-17x20.dmm"
|
||||
name = "Explorer home."
|
||||
description = "A small wooden home with various hunting prizes and the basics to survive in the wilderness."
|
||||
|
||||
/datum/map_template/shelter/superpose/Farm
|
||||
shelter_id = "Farm"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/Farm-32x32.dmm"
|
||||
name = "Farm."
|
||||
description = "A medium size farm with all the needs to grow food!"
|
||||
|
||||
/datum/map_template/shelter/superpose/FieldLab
|
||||
shelter_id = "FieldLab"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/FieldLab-20x20.dmm"
|
||||
name = "Field laboratory."
|
||||
description = "A compact laboratory with various science machines and equipment."
|
||||
|
||||
/datum/map_template/shelter/superpose/HellCave
|
||||
shelter_id = "HellCave"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/HellCave-40x25.dmm"
|
||||
name = "Hell cave."
|
||||
description = "A small cave corrupted by redspace, filled with various cultist items."
|
||||
|
||||
/datum/map_template/shelter/superpose/HydroCave
|
||||
shelter_id = "HydroCave"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/HydroCave-40x40.dmm"
|
||||
name = "Hydroponics cave."
|
||||
description = "A burried hydroponics facility with various living quarters needs and equipment."
|
||||
|
||||
/datum/map_template/shelter/superpose/LargeAlienShip
|
||||
shelter_id = "LargeAlienShip"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/LargeAlienShip-60x29.dmm"
|
||||
name = "Large alien ship."
|
||||
description = "A large alien ship filled with various alien machines and items."
|
||||
|
||||
/datum/map_template/shelter/superpose/LoneHome
|
||||
shelter_id = "LoneHome"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/LoneHome-20x25.dmm"
|
||||
name = "Lonely home."
|
||||
description = "An old very worn down wooden house, with enough materials and tools to refurnish and repair it."
|
||||
|
||||
/datum/map_template/shelter/superpose/MechFabShip
|
||||
shelter_id = "MechFabShip"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/MechFabShip-27x24.dmm"
|
||||
name = "Mech fabrication ship."
|
||||
description = "A medium size ship equiped with mech fabrication machines."
|
||||
|
||||
/datum/map_template/shelter/superpose/MechStorageFab
|
||||
shelter_id = "MechStorageFab"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/MechStorageFab-32x24.dmm"
|
||||
name = "Mech storage facility."
|
||||
description = "An old abandoned mech fabrication facility, most of the facility seems functional."
|
||||
|
||||
/datum/map_template/shelter/superpose/MercShip
|
||||
shelter_id = "MercShip"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/MercShip-60x29.dmm"
|
||||
name = "Mercenary ship."
|
||||
description = "A old mercenery ship filled with various trading goods."
|
||||
|
||||
/datum/map_template/shelter/superpose/MethLab
|
||||
shelter_id = "MethLab"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/MethLab-20x20.dmm"
|
||||
name = "Meth laboratory."
|
||||
description = "A old worn down chemical lab used to produce illegal goods."
|
||||
|
||||
/datum/map_template/shelter/superpose/OldHotel
|
||||
shelter_id = "OldHotel"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/OldHotel-25x25.dmm"
|
||||
name = "Old hotel."
|
||||
description = "An old worn down wooden hotel, heavily damaged but with enough materials to patch it up."
|
||||
|
||||
/datum/map_template/shelter/superpose/ScienceShip
|
||||
shelter_id = "ScienceShip"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/ScienceShip-25x33.dmm"
|
||||
name = "Science ship."
|
||||
description = "An expedition science ship with all the needs to host a small team."
|
||||
|
||||
/datum/map_template/shelter/superpose/SmallCombatShip
|
||||
shelter_id = "SmallCombatShip"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/SmallCombatShip-9x11.dmm"
|
||||
name = "Small combat ship."
|
||||
description = "A small combat ship with the bear minimum needs for survival."
|
||||
|
||||
/datum/map_template/shelter/superpose/SurvivalBarracks
|
||||
shelter_id = "SurvivalBarracks"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/SurvivalBarracks-11x11.dmm"
|
||||
name = "Survival barracks."
|
||||
description = "NT pantented living quarters survival pod, all the needs to host 4 crew-mates."
|
||||
|
||||
/datum/map_template/shelter/superpose/SurvivalCargo
|
||||
shelter_id = "SurvivalCargo"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/SurvivalCargo-11x11.dmm"
|
||||
name = "Survival cargo dep."
|
||||
description = "NT pantented cargo department survival pod, loaded with mining, crates and cargo gear."
|
||||
|
||||
/datum/map_template/shelter/superpose/SurvivalDIY_11x11
|
||||
shelter_id = "SurvivalDIY_11x11"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/SurvivalDIY-11x11.dmm"
|
||||
name = "Survival DIY large."
|
||||
description = "NT pantented Do-it-yourself survival pod, a large inflatable building filled with building materials. It even has a RCD and a cargo vehicle."
|
||||
|
||||
/datum/map_template/shelter/superpose/SurvivalDIY_7x7
|
||||
shelter_id = "SurvivalDIY_7x7"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/SurvivalDIY-7x7.dmm"
|
||||
name = "Survival DIY medium."
|
||||
description = "NT pantented Do-it-yourself survival pod, a medium inflatable building filled with building materials. It even has a RCD and a quad-bike."
|
||||
|
||||
/datum/map_template/shelter/superpose/SurvivalDIY_9x9
|
||||
shelter_id = "SurvivalDIY_9x9"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/SurvivalDIY-9x9.dmm"
|
||||
name = "Survival DIY small."
|
||||
description = "NT pantented Do-it-yourself survival pod, a small inflatable building filled with building materials. It even has a RCD."
|
||||
|
||||
/datum/map_template/shelter/superpose/SurvivalDinner
|
||||
shelter_id = "SurvivalDinner"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/SurvivalDinner-11x11.dmm"
|
||||
name = "Survival mess hall."
|
||||
description = "NT pantented mess hall and kitchen survival pod, it has all a kitchen requires to cook food. Bathroom included!"
|
||||
|
||||
/datum/map_template/shelter/superpose/SurvivalEngineering
|
||||
shelter_id = "SurvivalEngineering"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/SurvivalEngineering-9x9.dmm"
|
||||
name = "Survival engineering dep."
|
||||
description = "NT pantented engineering survival pod, loaded with tools, machines and materials to patch and fix any facility."
|
||||
|
||||
/datum/map_template/shelter/superpose/SurvivalHome
|
||||
shelter_id = "SurvivalHome"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/SurvivalHome-9x9.dmm"
|
||||
name = "Survival home pod."
|
||||
description = "A medium survival pod that can host a small team, has some basic survival gear."
|
||||
|
||||
/datum/map_template/shelter/superpose/SurvivalHydro
|
||||
shelter_id = "SurvivalHydro"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/SurvivalHydro-9x9.dmm"
|
||||
name = "Survival hydroponics bay. "
|
||||
description = "NT pantented hydroponics survival pod, loaded with everything you need to start growing food."
|
||||
|
||||
/datum/map_template/shelter/superpose/SurvivalJanitor
|
||||
shelter_id = "SurvivalJanitor"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/SurvivalJanitor-7x7.dmm"
|
||||
name = "Survival janitor pod."
|
||||
description = "NT pantented janitor survival pod, loaded with enough cleaning supplies to clean any mess."
|
||||
|
||||
/datum/map_template/shelter/superpose/SurvivalLeisure
|
||||
shelter_id = "SurvivalLeisure"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/SurvivalLeisure-9x9.dmm"
|
||||
name = "Survival leisure pod."
|
||||
description = "NT pantented leisure survival pod, loaded with various recreational goods to stave off boredom."
|
||||
|
||||
/datum/map_template/shelter/superpose/SurvivalLuxuryBar
|
||||
shelter_id = "SurvivalLuxuryBar"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/SurvivalLuxuryBar-11x11.dmm"
|
||||
name = "Survival luxury bar."
|
||||
description = "A luxurious bar pod, includes a large selection of liquors, bathroom and even a strip room!"
|
||||
|
||||
/datum/map_template/shelter/superpose/SurvivalLuxuryHome
|
||||
shelter_id = "SurvivalLuxuryHome"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/SurvivalLuxuryHome-11x11.dmm"
|
||||
name = "Survival luxury home."
|
||||
description = "A luxurious pod filled with various home amenities, is a home away from home!"
|
||||
|
||||
/datum/map_template/shelter/superpose/SurvivalMedical
|
||||
shelter_id = "SurvivalMedical"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/SurvivalMedical-9x9.dmm"
|
||||
name = "Survival medical dep."
|
||||
description = "NT pantented medical survival pod, loaded with medical equipment, scanner, sleeper and a surgery table."
|
||||
|
||||
/datum/map_template/shelter/superpose/SurvivalPool
|
||||
shelter_id = "SurvivalPool"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/SurvivalPool-11x11.dmm"
|
||||
name = "Survival pool pod."
|
||||
description = "NT pantented leisure pool survival pod, a leisure structure for crew to workout and relax."
|
||||
|
||||
/datum/map_template/shelter/superpose/SurvivalQuarters
|
||||
shelter_id = "SurvivalQuarters"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/SurvivalQuarters-9x9.dmm"
|
||||
name = "Survival living quarters."
|
||||
description = "NT pantented survival quarters pod, loaded with survival equipment and enough beds for 4 crewmates."
|
||||
|
||||
/datum/map_template/shelter/superpose/SurvivalScience
|
||||
shelter_id = "SurvivalScience"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/SurvivalScience-9x9.dmm"
|
||||
name = "Survival science dep."
|
||||
description = "NT pantented science survival pod, loaded with research terminals, mech fabricator, autolathe and everything to do field research."
|
||||
|
||||
/datum/map_template/shelter/superpose/SurvivalSecurity
|
||||
shelter_id = "SurvivalSecurity"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/SurvivalSecurity-9x9.dmm"
|
||||
name = "Survival security dep."
|
||||
description = "NT pantented security survival pod, a high security brig with and some security equipment."
|
||||
|
||||
/datum/map_template/shelter/superpose/TinyCombatShip
|
||||
shelter_id = "TinyCombatShip"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/TinyCombatShip-9x7.dmm"
|
||||
name = "Tiny combat ship."
|
||||
description = "A very small combat ship with the bare minimum of survival gear."
|
||||
|
||||
/datum/map_template/shelter/superpose/TradingShip
|
||||
shelter_id = "TradingShip"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/TradingShip-40x22.dmm"
|
||||
name = "Trading ship."
|
||||
description = "A trading ship stocked with various goods."
|
||||
|
||||
/datum/map_template/shelter/superpose/WoodenCamp
|
||||
shelter_id = "WoodenCamp"
|
||||
mappath = "modular_chomp/maps/submaps/shelters/WoodenCamp-10x10.dmm"
|
||||
name = "Wooden camp."
|
||||
description = "A very small camping lodge, a quick emergency hut to stave off the planets weather."
|
||||
@@ -0,0 +1,2 @@
|
||||
/mob/living/simple_mob/vore/alienanimals/teppi/baby
|
||||
mob_size = MOB_MEDIUM
|
||||
Reference in New Issue
Block a user