diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm index e38849ccf2c..e51a1f29492 100644 --- a/code/__DEFINES/mode.dm +++ b/code/__DEFINES/mode.dm @@ -292,6 +292,8 @@ DEFINE_BITFIELD(whitelist_status, list( #define FACTION_LIST_WY list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY) #define FACTION_LIST_UPP list(FACTION_UPP) #define FACTION_LIST_UPP_COLONY list(FACTION_COLONIST, FACTION_UPP) +#define FACTION_LIST_UA_COLONY list(FACTION_COLONIST, FACTION_MARINE) +#define FACTION_LIST_WY_COLONY list(FACTION_COLONIST, FACTION_WY) #define FACTION_LIST_CLF list(FACTION_CLF) #define FACTION_LIST_TWE list(FACTION_TWE) #define FACTION_LIST_FREELANCER list(FACTION_FREELANCER) diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm index 1d543c0e0ec..e26a818347b 100644 --- a/code/__DEFINES/radio.dm +++ b/code/__DEFINES/radio.dm @@ -39,7 +39,7 @@ #define RADIO_CHANNEL_SPECIAL "special" #define RADIO_CHANNEL_USASF "USASF" #define RADIO_CHANNEL_US_ARMY "US Army" - +#define RADIO_CHANNEL_UA_GUARD "UA Colonial Guard" //CLF Comms #define RADIO_CHANNEL_CLF_GEN "CLF" #define RADIO_CHANNEL_CLF_CMD "CLF Command" diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm index b353d71842e..e5490b0d14f 100644 --- a/code/controllers/subsystem/communications.dm +++ b/code/controllers/subsystem/communications.dm @@ -78,6 +78,7 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency #define CMB_FREQ 1220 #define ASF_FREQ 1224 #define ARM_FREQ 1228 +#define GRD_FREQ 1229 //WY Channels (1230-1249) #define WY_FREQ 1231 @@ -155,6 +156,7 @@ GLOBAL_LIST_INIT(radiochannels, list( RADIO_CHANNEL_CMB = CMB_FREQ, RADIO_CHANNEL_USASF = ASF_FREQ, RADIO_CHANNEL_US_ARMY = ARM_FREQ, + RADIO_CHANNEL_UA_GUARD = GRD_FREQ, RADIO_CHANNEL_DUTCH_DOZEN = DUT_FREQ, RADIO_CHANNEL_ROYAL_MARINE = RMC_FREQ, @@ -283,6 +285,7 @@ SUBSYSTEM_DEF(radio) "[CMB_FREQ]" = "cmbradio", "[ASF_FREQ]" = "usasfradio", "[ARM_FREQ]" = "armyradio", + "[GRD_FREQ]" = "guardradio", "[ALPHA_FREQ]" = "alpharadio", "[BRAVO_FREQ]" = "bravoradio", "[CHARLIE_FREQ]" = "charlieradio", diff --git a/code/datums/emergency_calls/cmb.dm b/code/datums/emergency_calls/cmb.dm index bbe2e161842..e45aea670de 100644 --- a/code/datums/emergency_calls/cmb.dm +++ b/code/datums/emergency_calls/cmb.dm @@ -141,22 +141,22 @@ if(!leader && HAS_FLAG(mob?.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(mob.client, JOB_SQUAD_LEADER, time_required_for_job)) leader = mob to_chat(mob, SPAN_ROLE_HEADER("You are the Marine Fireteam Leader of Anchorpoint Station!")) - arm_equipment(mob, /datum/equipment_preset/uscm/cmb/leader, TRUE, TRUE) // placeholder + arm_equipment(mob, /datum/equipment_preset/uscm/leader_equipped, TRUE, TRUE) // placeholder else if(smartgunners < max_smartgunners && HAS_FLAG(mob?.client.prefs.toggles_ert, PLAY_SMARTGUNNER) && check_timelock(mob.client, JOB_SQUAD_SMARTGUN, time_required_for_job)) smartgunners++ to_chat(mob, SPAN_ROLE_HEADER("You are a Smartgunner of Anchorpoint Station!")) - arm_equipment(mob, /datum/equipment_preset/uscm/cmb/smartgunner, TRUE, TRUE) + arm_equipment(mob, /datum/equipment_preset/uscm/smartgunner_equipped, TRUE, TRUE) else if (medics < max_medics && HAS_FLAG(mob?.client.prefs.toggles_ert, PLAY_MEDIC) && check_timelock(mob.client, JOB_SQUAD_MEDIC, time_required_for_job)) medics++ to_chat(mob, SPAN_ROLE_HEADER("You are a Marine Corpsman of Anchorpoint Station!")) - arm_equipment(mob, /datum/equipment_preset/uscm/cmb/medic, TRUE, TRUE) + arm_equipment(mob, /datum/equipment_preset/uscm/medic_equipped, TRUE, TRUE) else if(engineers < max_engineers && HAS_FLAG(mob?.client.prefs.toggles_ert, PLAY_ENGINEER) && check_timelock(mob.client, JOB_SQUAD_ENGI, time_required_for_job)) engineers++ to_chat(mob, SPAN_ROLE_HEADER("You are a Technical Specialist of Anchorpoint Station!")) - arm_equipment(mob, /datum/equipment_preset/uscm/cmb/rto, TRUE, TRUE) + arm_equipment(mob, /datum/equipment_preset/uscm/tl_equipped, TRUE, TRUE) else to_chat(mob, SPAN_ROLE_HEADER("You are a Marine Rifleman of Anchorpoint Station!")) - arm_equipment(mob, /datum/equipment_preset/uscm/cmb, TRUE, TRUE) + arm_equipment(mob, /datum/equipment_preset/uscm/private_equipped, TRUE, TRUE) print_backstory(mob) diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 6170424db33..43b1297886c 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -70,15 +70,6 @@ var/override_map /datum/map_config/New() - survivor_types = list( - /datum/equipment_preset/survivor/scientist, - /datum/equipment_preset/survivor/doctor, - /datum/equipment_preset/survivor/chef, - /datum/equipment_preset/survivor/chaplain, - /datum/equipment_preset/survivor/miner, - /datum/equipment_preset/survivor/colonial_marshal, - /datum/equipment_preset/survivor/engineer, - ) synth_survivor_types = list( /datum/equipment_preset/synth/survivor/medical_synth, diff --git a/code/datums/supply_packs/black_market.dm b/code/datums/supply_packs/black_market.dm index 7bd3c1b212d..316c536dbe9 100644 --- a/code/datums/supply_packs/black_market.dm +++ b/code/datums/supply_packs/black_market.dm @@ -1278,7 +1278,7 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro var/mob/living/carbon/human/corpse = new (loc) corpse.create_hud() //Need to generate hud before we can equip anything apparently... - var/corpse_type = pick(/datum/equipment_preset/corpse/clf/burst, /datum/equipment_preset/corpse/clf) + var/corpse_type = pick(/datum/equipment_preset/corpse/bluecollar, /datum/equipment_preset/corpse/whitecollar) arm_equipment(corpse, corpse_type, TRUE, FALSE) // I didn't choose the shitcode life, the shitcode life chose me loot_message = SPAN_HIGHDANGER("IT'S A CORPSE!!") diff --git a/code/game/jobs/job/antag/xeno/xenomorph.dm b/code/game/jobs/job/antag/xeno/xenomorph.dm index eeca16bc7f9..ea1b6e27bd6 100644 --- a/code/game/jobs/job/antag/xeno/xenomorph.dm +++ b/code/game/jobs/job/antag/xeno/xenomorph.dm @@ -34,14 +34,6 @@ human_to_transform.set_stat(UNCONSCIOUS) human_to_transform.forceMove(get_turf(pick(GLOB.xeno_spawns))) - var/list/survivor_types = list( - /datum/equipment_preset/survivor/scientist, - /datum/equipment_preset/survivor/doctor, - /datum/equipment_preset/survivor/security, - /datum/equipment_preset/survivor/engineer - ) - arm_equipment(human_to_transform, pick(survivor_types), FALSE, FALSE) - for(var/obj/item/device/radio/radio in human_to_transform.contents_recursive()) radio.listening = FALSE diff --git a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm index 9236411bf63..0a6bf52c3a4 100644 --- a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm +++ b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm @@ -179,9 +179,9 @@ GLOBAL_LIST_INIT(cm_vending_clothing_req_officer, list( list("Quartermaster Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/RO, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Headgear (CHOOSE 1)", 0, null, null, null), - list("Quartermaster Cap", 0, /obj/item/clothing/head/cmcap/req/ro, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED), + list("Quartermaster Cap", 0, /obj/item/clothing/head/cmcap/khaki, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED), list("Quartermaster Beret", 0, /obj/item/clothing/head/beret/marine/ro, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED), - list("Requisitions Cap", 0, /obj/item/clothing/head/cmcap/req, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("Requisitions Cap", 0, /obj/item/clothing/head/cmcap/khaki, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null), list("M4A3 Service Pistol", 0, /obj/item/storage/belt/gun/m4a3/full, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm index 0527efcabbd..43d6caebffc 100644 --- a/code/game/machinery/vending/vendor_types/crew/synthetic.dm +++ b/code/game/machinery/vending/vendor_types/crew/synthetic.dm @@ -245,8 +245,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list( list("Ushanka", 12, /obj/item/clothing/head/ushanka, null, VENDOR_ITEM_REGULAR), list("Cap", 12, /obj/item/clothing/head/cmcap, null, VENDOR_ITEM_REGULAR), list("MP Cap", 12, /obj/item/clothing/head/beret/marine/mp/mpcap, null, VENDOR_ITEM_REGULAR), - list("QM Cap", 12, /obj/item/clothing/head/cmcap/req/ro, null, VENDOR_ITEM_REGULAR), - list("Req Cap", 12, /obj/item/clothing/head/cmcap/req, null, VENDOR_ITEM_REGULAR), + list("Req Cap", 12, /obj/item/clothing/head/cmcap/khaki, null, VENDOR_ITEM_REGULAR), list("Officer Cap", 12, /obj/item/clothing/head/cmcap/bridge, null, VENDOR_ITEM_REGULAR), list("Bio Hood", 12, /obj/item/clothing/head/bio_hood/synth, null, VENDOR_ITEM_REGULAR), list("Fedora", 12, /obj/item/clothing/head/fedora, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/objects/effects/landmarks/corpsespawner.dm b/code/game/objects/effects/landmarks/corpsespawner.dm index cbcd8f906ec..b6dc424e9fe 100644 --- a/code/game/objects/effects/landmarks/corpsespawner.dm +++ b/code/game/objects/effects/landmarks/corpsespawner.dm @@ -16,197 +16,39 @@ GLOB.corpse_spawns -= src return ..() -///////////Civilians////////////////////// +/obj/effect/landmark/corpsespawner/bluecollar + name = "Corpse - Blue-Collar" + equip_path = /datum/equipment_preset/corpse/bluecollar + +/obj/effect/landmark/corpsespawner/whitecollar + name = "Corpse - White-Collar" + equip_path = /datum/equipment_preset/corpse/whitecollar + +/obj/effect/landmark/corpsespawner/guard + name = "Corpse - Security Guard, Prison" + equip_path = /datum/equipment_preset/corpse/guard /obj/effect/landmark/corpsespawner/prisoner - name = "Prisoner" + name = "Corpse - Prisoner" equip_path = /datum/equipment_preset/corpse/prisoner -/obj/effect/landmark/corpsespawner/chef - name = "Chef" - equip_path = /datum/equipment_preset/corpse/chef +/obj/effect/landmark/corpsespawner/riot + name = "Corpse - Security Guard, UA Colonial Guard" + equip_path = /datum/equipment_preset/corpse/riot /obj/effect/landmark/corpsespawner/doctor - name = "Doctor" + name = "Corpse - Doctor" equip_path = /datum/equipment_preset/corpse/doctor -/obj/effect/landmark/corpsespawner/engineer - name = "Engineer" - equip_path = /datum/equipment_preset/corpse/engineer - -/obj/effect/landmark/corpsespawner/scientist - name = "Scientist" - equip_path = /datum/equipment_preset/corpse/scientist - -/obj/effect/landmark/corpsespawner/miner - name = "Shaft Miner" - equip_path = /datum/equipment_preset/corpse/miner +/obj/effect/landmark/corpsespawner/scrubs + name = "Corpse - Doctor, Scrubs" + equip_path = /datum/equipment_preset/corpse/doctor/scrubs /obj/effect/landmark/corpsespawner/security - name = "Security Officer" - equip_path = /datum/equipment_preset/corpse/security - -/obj/effect/landmark/corpsespawner/security/marshal - name = "Colonial Marshal Deputy" - equip_path = /datum/equipment_preset/corpse/security/cmb - -/obj/effect/landmark/corpsespawner/security/liaison - name = "Corporate Liaison" - equip_path = /datum/equipment_preset/corpse/liaison - -/obj/effect/landmark/corpsespawner/prison_security - name = "Prison Guard" - equip_path = /datum/equipment_preset/corpse/prison_guard - -/////////////////Officers////////////////////// - -/obj/effect/landmark/corpsespawner/bridgeofficer - name = "Colony Division Manager" - equip_path = /datum/equipment_preset/corpse/manager - -/obj/effect/landmark/corpsespawner/administrator - name = "Colony Administrator" - equip_path = /datum/equipment_preset/corpse/administrator - -/obj/effect/landmark/corpsespawner/administrator/burst - name = "Burst Colony Administrator" - equip_path = /datum/equipment_preset/corpse/administrator/burst - -/obj/effect/landmark/corpsespawner/wysec - name = "Weyland-Yutani Corporate Security Guard" - equip_path = /datum/equipment_preset/corpse/wysec - -/obj/effect/landmark/corpsespawner/wygoon - name = "Weyland-Yutani Corporate Security Officer" - equip_path = /datum/equipment_preset/corpse/pmc/goon - -/obj/effect/landmark/corpsespawner/wygoon/lead - name = "Weyland-Yutani Corporate Security Lead" - equip_path = /datum/equipment_preset/corpse/pmc/goon/lead - -/obj/effect/landmark/corpsespawner/wygoon/lead/burst - name = "Burst Weyland-Yutani Corporate Security Lead" - equip_path = /datum/equipment_preset/corpse/pmc/goon/lead/burst - -///CM specific jobs/// - -/obj/effect/landmark/corpsespawner/colonist //default is a colonist - name = "Colonist" - equip_path = /datum/equipment_preset/corpse/colonist - -/obj/effect/landmark/corpsespawner/colonist/burst - name = "Burst Colonist" - equip_path = /datum/equipment_preset/corpse/colonist/burst - -/obj/effect/landmark/corpsespawner/colonist/kutjevo - name = "Colonist Kutjevo" - equip_path = /datum/equipment_preset/corpse/colonist/kutjevo - -/obj/effect/landmark/corpsespawner/colonist/kutjevo/burst - name = "Burst Colonist Kutjevo" - equip_path = /datum/equipment_preset/corpse/colonist/kutjevo/burst - -/obj/effect/landmark/corpsespawner/colonist/random - name = "Colonist Random" - equip_path = /datum/equipment_preset/corpse/colonist/random - -/obj/effect/landmark/corpsespawner/colonist/random/burst - name = "Burst Colonist Random" - equip_path = /datum/equipment_preset/corpse/colonist/random/burst - -/obj/effect/landmark/corpsespawner/ua_riot - name = "UA Officer" - equip_path = /datum/equipment_preset/corpse/ua_riot - -/obj/effect/landmark/corpsespawner/ua_riot/burst - name = "Burst UA Officer" - equip_path = /datum/equipment_preset/corpse/ua_riot/burst - -/obj/effect/landmark/corpsespawner/wy/manager - name = "Corporate Supervisor" - equip_path = /datum/equipment_preset/corpse/wy/manager - -/obj/effect/landmark/corpsespawner/wy/manager/burst - name = "Burst Corporate Supervisor" - equip_path = /datum/equipment_preset/corpse/wy/manager/burst - - -///////////Faction Specific Corpses////////////////////// - -/obj/effect/landmark/corpsespawner/clf - name = "Colonial Liberation Front Soldier" - equip_path = /datum/equipment_preset/corpse/clf - -/obj/effect/landmark/corpsespawner/clf/burst - name = "Burst Colonial Liberation Front Soldier" - equip_path = /datum/equipment_preset/corpse/clf/burst - -/obj/effect/landmark/corpsespawner/upp - name = "Union of Progressive Peoples Soldier" - equip_path = /datum/equipment_preset/corpse/upp - -/obj/effect/landmark/corpsespawner/upp/burst - name = "Burst Union of Progressive Peoples Soldier" - equip_path = /datum/equipment_preset/corpse/upp/burst - -/obj/effect/landmark/corpsespawner/pmc - name = "Weyland-Yutani PMC (Standard)" - equip_path = /datum/equipment_preset/corpse/pmc - -/obj/effect/landmark/corpsespawner/pmc/burst - name = "Burst Weyland-Yutani PMC (Standard)" - equip_path = /datum/equipment_preset/corpse/pmc/burst - -/obj/effect/landmark/corpsespawner/freelancer - name = "Freelancer" - equip_path = /datum/equipment_preset/corpse/freelancer - -/obj/effect/landmark/corpsespawner/freelancer/burst - name = "Burst Freelancer" - equip_path = /datum/equipment_preset/corpse/freelancer/burst - -// Fun Faction Corpse - -/obj/effect/landmark/corpsespawner/realpirate - name = "Pirate" - equip_path = /datum/equipment_preset/corpse/realpirate - -/obj/effect/landmark/corpsespawner/realpirate/ranged - name = "Pirate Gunner" - equip_path = /datum/equipment_preset/corpse/realpirate/ranged - -/obj/effect/landmark/corpsespawner/russian - name = "Russian" - equip_path = /datum/equipment_preset/corpse/russian - -/obj/effect/landmark/corpsespawner/russian/ranged - -/obj/effect/landmark/corpsespawner/dutchrifle - name = "Dutch Dozen Rifleman" - equip_path = /datum/equipment_preset/corpse/dutchrifle - -/obj/effect/landmark/corpsespawner/dutchrifle/burst - name = "Burst Dutch Dozen Rifleman" - equip_path = /datum/equipment_preset/corpse/dutchrifle/burst - -/obj/effect/landmark/corpsespawner/pizza - name = "Pizza Deliverer" - equip_path = /datum/equipment_preset/corpse/pizza - -/obj/effect/landmark/corpsespawner/pizza/burst - name = "Burst Pizza Deliverer" - equip_path = /datum/equipment_preset/corpse/pizza/burst - -/obj/effect/landmark/corpsespawner/gladiator - name = "Gladiator" - equip_path = /datum/equipment_preset/corpse/gladiator - -/obj/effect/landmark/corpsespawner/gladiator/burst - name = "Burst Gladiator" - equip_path = /datum/equipment_preset/corpse/gladiator/burst + name = "Corpse - Security Guard, Wey-Yu" + equip_path = /datum/equipment_preset/colonist/corpse/security //FORECON - /obj/effect/landmark/corpsespawner/forecon_spotter name = "USCM Reconnaissance Spotter" equip_path = /datum/equipment_preset/corpse/forecon_spotter diff --git a/code/game/objects/effects/landmarks/survivor_spawner.dm b/code/game/objects/effects/landmarks/survivor_spawner.dm index 6176b8324c0..a6e377c0e7f 100644 --- a/code/game/objects/effects/landmarks/survivor_spawner.dm +++ b/code/game/objects/effects/landmarks/survivor_spawner.dm @@ -87,7 +87,7 @@ //Weyland-Yutani Survivors// /obj/effect/landmark/survivor_spawner/lv624_corporate_dome_cl - equipment = /datum/equipment_preset/survivor/wy/executive + equipment = /datum/equipment_preset/colonist/whitecollar synth_equipment = /datum/equipment_preset/synth/survivor/wy/security_synth intro_text = list("

You are the last alive Executive of Lazarus Landing!

",\ "You are aware of the xenomorph threat.",\ @@ -97,7 +97,7 @@ spawn_priority = SPAWN_PRIORITY_VERY_HIGH /obj/effect/landmark/survivor_spawner/lv624_corporate_dome_goon - equipment = /datum/equipment_preset/survivor/goon + equipment = /datum/equipment_preset/colonist/security/weyland synth_equipment = /datum/equipment_preset/synth/survivor/wy/security_synth intro_text = list("

You are a Corporate Security Officer!

",\ "You are aware of the xenomorph threat.",\ @@ -120,7 +120,7 @@ spawn_priority = SPAWN_PRIORITY_HIGH /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_medic - equipment = /datum/equipment_preset/survivor/pmc/medic + equipment = /datum/equipment_preset/pmc/pmc_medic synth_equipment = /datum/equipment_preset/synth/survivor/pmc intro_text = list("

You are a survivor of a crash landing!

",\ "You are NOT aware of the xenomorph threat.",\ @@ -133,7 +133,7 @@ spawn_priority = SPAWN_PRIORITY_VERY_HIGH /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_engineer - equipment = /datum/equipment_preset/survivor/pmc/engineer + equipment = /datum/equipment_preset/pmc/pmc_standard synth_equipment = /datum/equipment_preset/synth/survivor/pmc intro_text = list("

You are a survivor of a crash landing!

",\ "You are NOT aware of the xenomorph threat.",\ @@ -146,7 +146,7 @@ spawn_priority = SPAWN_PRIORITY_VERY_HIGH /obj/effect/landmark/survivor_spawner/bigred_crashed_cl - equipment = /datum/equipment_preset/survivor/wy/manager + equipment = /datum/equipment_preset/colonist/whitecollar synth_equipment = /datum/equipment_preset/synth/survivor/pmc intro_text = list("

You are a survivor of a crash landing!

",\ "You are NOT aware of the xenomorph threat.",\ @@ -159,7 +159,7 @@ spawn_priority = SPAWN_PRIORITY_VERY_HIGH /obj/effect/landmark/survivor_spawner/shivas_panic_room_cl - equipment = /datum/equipment_preset/survivor/wy/asstmanager + equipment = /datum/equipment_preset/colonist/whitecollar synth_equipment = /datum/equipment_preset/synth/survivor/wy/corporate_synth intro_text = list("

You are the last alive Senior Administrator on the Colony!

",\ "You are aware of the xenomorph threat.",\ @@ -169,7 +169,7 @@ spawn_priority = SPAWN_PRIORITY_VERY_HIGH /obj/effect/landmark/survivor_spawner/shivas_panic_room_doc - equipment = /datum/equipment_preset/survivor/doctor + equipment = /datum/equipment_preset/colonist/doctor synth_equipment = /datum/equipment_preset/synth/survivor/emt_synth intro_text = list("

You are a Medical Doctor on the Colony!

",\ "You are aware of the xenomorph threat.",\ @@ -179,7 +179,7 @@ spawn_priority = SPAWN_PRIORITY_HIGH /obj/effect/landmark/survivor_spawner/shivas_panic_room_sci - equipment = /datum/equipment_preset/survivor/scientist + equipment = /datum/equipment_preset/colonist/researcher synth_equipment = /datum/equipment_preset/synth/survivor/scientist_synth intro_text = list("

You are a Weyland-Yutani Scientist on the Colony!

",\ "You are aware of the xenomorph threat.",\ @@ -189,7 +189,7 @@ spawn_priority = SPAWN_PRIORITY_HIGH /obj/effect/landmark/survivor_spawner/shivas_panic_room_civ - equipment = /datum/equipment_preset/survivor/civilian + equipment = /datum/equipment_preset/colonist synth_equipment = /datum/equipment_preset/synth/survivor/chef_synth intro_text = list("

You are a worker on the Colony!

",\ "You are aware of the xenomorph threat.",\ @@ -201,8 +201,8 @@ //CMB Survivors// /obj/effect/landmark/survivor_spawner/fiorina_armory_cmb - equipment = /datum/equipment_preset/survivor/cmb/standard - synth_equipment = /datum/equipment_preset/synth/survivor/cmb/synth + equipment = /datum/equipment_preset/cmb/standard + synth_equipment = /datum/equipment_preset/cmb/synth intro_text = list("

You are a CMB Deputy!

",\ "You are aware of the 'alien' threat.",\ "Your primary objective is to survive the infestation.") @@ -211,8 +211,8 @@ spawn_priority = SPAWN_PRIORITY_VERY_HIGH /obj/effect/landmark/survivor_spawner/fiorina_armory_riot_control - equipment = /datum/equipment_preset/survivor/cmb/ua - synth_equipment = /datum/equipment_preset/synth/survivor/cmb/ua_synth + equipment = /datum/equipment_preset/colonist/security/prison + synth_equipment = /datum/equipment_preset/cmb/synth intro_text = list("

You are a United Americas Riot Control Officer!

",\ "You are aware of the 'alien' threat.",\ "Your primary objective is to survive the infestation.") diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index ca9cf573897..f85a6e6cb50 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -412,3 +412,8 @@ name = "\improper US Army Command Radio Encryption Key" icon_state = "sec_key" channels = list(RADIO_CHANNEL_US_ARMY = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_COLONY = TRUE, RADIO_CHANNEL_JTAC = TRUE, SQUAD_MARINE_1 = TRUE) + +/obj/item/device/encryptionkey/guard + name = "\improper UA Colonial Guard Radio Encryption Key" + icon_state = "stripped_key" + channels = list(RADIO_CHANNEL_UA_GUARD = TRUE, RADIO_CHANNEL_COLONY = TRUE) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index f43b012b37d..ffc247ad260 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -1244,3 +1244,12 @@ icon_state = "armcom_headset" initial_keys = list(/obj/item/device/encryptionkey/army/command/attache) volume = RADIO_VOLUME_CRITICAL + +/obj/item/device/radio/headset/distress/guard + name = "\improper Colonial Guard radio headset" + desc = "A robust headset used by members of the UA's Colonial Guard. Built to outlast those it's issued to. Featured channels include: ; - Colonial Guard, :o - Colony." + frequency = GRD_FREQ + icon_state = "generic_headset" + initial_keys = list(/obj/item/device/encryptionkey/guard) + has_hud = TRUE + hud_type = MOB_HUD_FACTION_MARINE diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm index ebfc4893cf5..1053965a7b8 100644 --- a/code/game/objects/items/props/helmetgarb.dm +++ b/code/game/objects/items/props/helmetgarb.dm @@ -501,6 +501,7 @@ name = "\improper RC6 riot shield" desc = "The complimentary, but sold separate face shield associated with the RC6 riot helmet." icon_state = "helmet_riot_shield" + flags_obj = OBJ_NO_HELMET_BAND /obj/item/prop/helmetgarb/trimmed_wire name = "trimmed barbed wire" diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 1d96f960ac9..afdb765d3cf 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -533,39 +533,45 @@ /obj/item/storage/belt/security/MP/CMB name = "\improper CMB duty belt" desc = "The black duty belt used to carry the instruments of a Colonial Marshal. It is a heavy police belt with several pouches to contain various law enforcement items." - storage_slots = 8 + storage_slots = 6 max_w_class = SIZE_MEDIUM max_storage_space = 30 /obj/item/storage/belt/security/MP/CMB/full/revolver/fill_preset_inventory() - new /obj/item/weapon/gun/energy/taser(src) new /obj/item/weapon/baton(src) new /obj/item/reagent_container/spray/pepper(src) new /obj/item/restraint/handcuffs(src) new /obj/item/restraint/handcuffs(src) - new /obj/item/restraint/handcuffs(src) new /obj/item/ammo_magazine/revolver/spearhead(src) new /obj/item/ammo_magazine/revolver/spearhead(src) /obj/item/storage/belt/security/MP/CMB/full/highpower/fill_preset_inventory() - new /obj/item/weapon/gun/energy/taser(src) new /obj/item/weapon/baton(src) new /obj/item/reagent_container/spray/pepper(src) new /obj/item/restraint/handcuffs(src) new /obj/item/restraint/handcuffs(src) - new /obj/item/restraint/handcuffs(src) new /obj/item/ammo_magazine/pistol/highpower(src) new /obj/item/ammo_magazine/pistol/highpower(src) /obj/item/storage/belt/security/MP/CMB/synth/fill_preset_inventory() - new /obj/item/explosive/grenade/flashbang(src) new /obj/item/device/flash(src) new /obj/item/weapon/baton(src) new /obj/item/reagent_container/spray/pepper(src) new /obj/item/device/clue_scanner(src) new /obj/item/restraint/handcuffs(src) new /obj/item/restraint/handcuffs(src) - new /obj/item/explosive/grenade/flashbang(src) + +/obj/item/storage/belt/security/MP/colonist + name = "duty belt" + desc = "The black security duty belt. It is a heavy police belt with several pouches to contain various law enforcement items." + storage_slots = 5 + max_w_class = SIZE_MEDIUM + max_storage_space = 30 + +/obj/item/storage/belt/security/MP/colonist/fill_preset_inventory() + new /obj/item/weapon/baton(src) + new /obj/item/reagent_container/spray/pepper(src) + new /obj/item/restraint/handcuffs(src) /obj/item/storage/belt/marine name = "\improper M276 pattern ammo load rig" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 31b142a924e..c70fca9b5bf 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -33,7 +33,7 @@ /obj/structure/closet/secure_closet/quartermaster_uscm/Initialize() . = ..() new /obj/item/clothing/under/rank/qm_suit(src) - new /obj/item/clothing/head/cmcap/req/ro(src) + new /obj/item/clothing/head/cmcap/khaki(src) new /obj/item/clothing/shoes/marine(src) new /obj/item/clothing/gloves/yellow(src) new /obj/item/device/flashlight(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm index 2b803f7f0af..17be52a92b6 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm @@ -309,7 +309,7 @@ GLOBAL_LIST_EMPTY(co_secure_boxes) new /obj/item/clothing/under/rank/qm_suit(src) new /obj/item/clothing/shoes/marine(src) new /obj/item/storage/belt/marine(src) - new /obj/item/clothing/head/cmcap/req(src) + new /obj/item/clothing/head/cmcap/khaki(src) new /obj/item/device/flashlight(src) new /obj/item/storage/backpack/marine/satchel(src) diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 759d1b0c7d4..8440737d3cd 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -288,13 +288,17 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name) path = /obj/item/clothing/head/cmcap/boonie /datum/gear/headwear/uscm/boonie_tan - display_name = "USCM boonie hat, tan" + display_name = "USCM boonie hat, khaki" path = /obj/item/clothing/head/cmcap/boonie/tan /datum/gear/headwear/uscm/cap display_name = "USCM cap" path = /obj/item/clothing/head/cmcap +/datum/gear/headwear/uscm/cap_khaki + display_name = "USCM cap, khaki" + path = /obj/item/clothing/head/cmcap/khaki + /datum/gear/headwear/uscm/cap/sulaco display_name = "USS Golden Arrow cap" path = /obj/item/clothing/head/sulacocap diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm index c957b4a0844..2eba8dd9041 100644 --- a/code/modules/clothing/head/head.dm +++ b/code/modules/clothing/head/head.dm @@ -380,22 +380,16 @@ name = "\improper USCM formal Commanding Officer's black cap" icon_state = "co_formalhat_black" -/obj/item/clothing/head/cmcap/req/ro - name = "\improper USCM quartermaster cap" - desc = "It's a fancy hat for a not-so-fancy military supply clerk." - icon_state = "rocap" - flags_atom = NO_SNOW_TYPE - -/obj/item/clothing/head/cmcap/req - name = "\improper USCM requisition cap" - desc = "It's a not-so-fancy hat for a not-so-fancy military supply clerk." - icon_state = "cargocap" +/obj/item/clothing/head/cmcap/khaki + name = "\improper khaki patrol cap" + desc = "A khaki patrol cap." + icon_state = "cap_khaki" flags_atom = FPRINT|NO_SNOW_TYPE /obj/item/clothing/head/cmcap/bridge name = "\improper USCM operations cap" desc = "A hat usually worn by officers in the USCM. While it provides no protection, some officers wear it in the field to make themselves more recognisable." - icon_state = "command_cap" + icon_state = "cap_operations" flags_atom = FPRINT|NO_SNOW_TYPE /obj/item/clothing/head/cmcap/flap @@ -422,6 +416,14 @@ WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi' ) +/obj/item/clothing/head/cmcap/corrections + name = "dark blue patrol cap" + desc = "A dark blue patrol cap." + icon_state = "corrections" + item_state = "corrections" + flags_marine_hat = HAT_GARB_OVERLAY + flags_atom = FPRINT|NO_SNOW_TYPE + //============================//BERETS\\=================================\\ //=======================================================================\\ //Berets DO NOT have armor, so they have their own category. PMC caps are helmets, so they're in helmets.dm. diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index e8da44e7de4..b4670b8d9d6 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -975,7 +975,8 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( item_state = "mp_helmet" armor_energy = CLOTHING_ARMOR_MEDIUMLOW specialty = "M10 pattern military police" - built_in_visors = list(new /obj/item/device/helmet_visor/security) + built_in_visors = list(new /obj/item/device/helmet_visor) + flags_atom = NO_SNOW_TYPE /obj/item/clothing/head/helmet/marine/MP/WO name = "\improper M3 pattern chief MP helmet" @@ -1097,11 +1098,9 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( //FIORINA / UA RIOT CONTROL HELMET// /obj/item/clothing/head/helmet/marine/veteran/ua_riot - name = "\improper RC6 helmet" - desc = "The standard UA Riot Control 6 helmet is of odd design, lacking a face shield by default (mounting points are available). The distinct white pattern and red emblem are synonymous with oppression throughout the rim." + name = "\improper M10 pattern ballistic helmet" + desc = "Standard issue high molecular density polymer combat helmet. Resistant to glancing hits from small arms and shrapnel. This version is stripped down, missing the typically incorporated tactical camera, IFF signal transponder, and heads up display eyepiece." icon_state = "ua_riot" - armor_energy = CLOTHING_ARMOR_MEDIUMLOW - specialty = "RC6" flags_atom = NO_SNOW_TYPE // KUTJEVO HELMET diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index ba57cc0f43f..6aaa8fc1e0a 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -10,7 +10,7 @@ w_class = SIZE_HUGE allowed = list(/obj/item/weapon/gun, /obj/item/storage/backpack/general_belt)//Guns only. uniform_restricted = list(/obj/item/clothing/under) - valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_ARMOR_A, ACCESSORY_SLOT_ARMOR_L, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) + valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_ARMOR_A, ACCESSORY_SLOT_ARMOR_L, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M, ACCESSORY_SLOT_PONCHO) restricted_accessory_slots = list(ACCESSORY_SLOT_ARMOR_A, ACCESSORY_SLOT_ARMOR_L, ACCESSORY_SLOT_ARMOR_S) slowdown = SLOWDOWN_ARMOR_LIGHT @@ -27,14 +27,16 @@ //armored vest /obj/item/clothing/suit/armor/vest - name = "armored vest" - desc = "Generic venlar bulletproof vest found in the hands of various private sector security types." + name = "stab-proof vest" + desc = "Generic protective vest found in the hands of various private sector security types designed to protect against stabs." icon_state = "armor" item_state = "armor" blood_overlay_type = "armor" + time_to_unequip = 10 + time_to_equip = 10 flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN - armor_melee = CLOTHING_ARMOR_MEDIUMLOW - armor_bullet = CLOTHING_ARMOR_MEDIUM + armor_melee = CLOTHING_ARMOR_MEDIUM + armor_bullet = CLOTHING_ARMOR_MEDIUMLOW armor_laser = CLOTHING_ARMOR_LOW armor_energy = CLOTHING_ARMOR_LOW armor_bomb = CLOTHING_ARMOR_LOW @@ -54,12 +56,25 @@ /obj/item/storage/belt/gun/m44, ) - +/obj/item/clothing/suit/armor/vest/ballistic + name = "ballistic vest" + desc = "Generic venlar vest found in the hands of various private sector security types designed to protect against low caliber pistol rounds." + icon = 'icons/obj/items/clothing/cm_suits.dmi' + item_icons = list( + WEAR_JACKET = 'icons/mob/humans/onmob/suit_1.dmi' + ) + icon_state = "ballistic_vest" + item_state = "ballistic_vest" + armor_melee = CLOTHING_ARMOR_MEDIUMLOW + armor_bullet = CLOTHING_ARMOR_MEDIUM /obj/item/clothing/suit/armor/vest/pilot name = "\improper M70 flak jacket" desc = "Venlar flak jacket worn by combat support personnel such as dropship crew, or occasionally by smartgunners. Despite the name it's actually better at stopping ballistics..." icon = 'icons/obj/items/clothing/cm_suits.dmi' + item_icons = list( + WEAR_JACKET = 'icons/mob/humans/onmob/suit_1.dmi' + ) icon_state = "pilot" blood_overlay_type = "armor" flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index ba43917a4c3..d65456bb944 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -95,8 +95,8 @@ //Chef /obj/item/clothing/suit/chef - name = "Chef's apron" - desc = "An apron used by a high-class chef." + name = "Chef's coat" + desc = "A coat used by a high-class chef." icon_state = "chef" item_state = "chef" gas_transfer_coefficient = 0.90 @@ -116,7 +116,7 @@ //Chef /obj/item/clothing/suit/chef/classic - name = "A classic chef's apron." + name = "white apron" desc = "A basic, dull, white chef's apron." icon_state = "apronchef" item_state = "apronchef" diff --git a/code/modules/clothing/suits/marine_coat.dm b/code/modules/clothing/suits/marine_coat.dm index 070a7009378..51dcf3ae213 100644 --- a/code/modules/clothing/suits/marine_coat.dm +++ b/code/modules/clothing/suits/marine_coat.dm @@ -377,6 +377,13 @@ item_state = "corporate_blue" has_buttons = FALSE +/obj/item/clothing/suit/storage/jacket/marine/corporate/grey + name = "grey suit jacket" + desc = "A grey suit jacket." + icon_state = "corporate_grey" + item_state = "corporate_grey" + has_buttons = FALSE + /obj/item/clothing/suit/storage/jacket/marine/bomber name = "khaki bomber jacket" desc = "A khaki bomber jacket popular among stationeers and blue-collar workers everywhere." @@ -405,6 +412,7 @@ name = "\improper UPP service uniform jacket" desc = "A UPP service uniform jacket featuring small dispersed para-aramid inserts providing the barest of defensive functionality." icon_state = "upp_coat_service" + flags_atom = NO_SNOW_TYPE /obj/item/clothing/suit/storage/jacket/marine/upp/mss name = "\improper MSS uniform jacket" diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index 74507c2e559..6914964eafc 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -112,54 +112,6 @@ armor_internaldamage = CLOTHING_ARMOR_LOW flags_jumpsuit = FALSE -/obj/item/clothing/under/rank/nursesuit - desc = "It's a jumpsuit commonly worn by nursing staff in the medical department." - name = "nurse's suit" - icon_state = "nursesuit" - permeability_coefficient = 0.50 - armor_melee = CLOTHING_ARMOR_NONE - armor_bullet = CLOTHING_ARMOR_NONE - armor_laser = CLOTHING_ARMOR_NONE - armor_energy = CLOTHING_ARMOR_NONE - armor_bomb = CLOTHING_ARMOR_NONE - armor_bio = CLOTHING_ARMOR_LOW - armor_rad = CLOTHING_ARMOR_LOW - armor_internaldamage = CLOTHING_ARMOR_LOW - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN - flags_jumpsuit = FALSE - -/obj/item/clothing/under/rank/nurse - desc = "A dress commonly worn by the nursing staff in the medical department." - name = "nurse's dress" - icon_state = "nurse" - permeability_coefficient = 0.50 - armor_melee = CLOTHING_ARMOR_NONE - armor_bullet = CLOTHING_ARMOR_NONE - armor_laser = CLOTHING_ARMOR_NONE - armor_energy = CLOTHING_ARMOR_NONE - armor_bomb = CLOTHING_ARMOR_NONE - armor_bio = CLOTHING_ARMOR_LOW - armor_rad = CLOTHING_ARMOR_LOW - armor_internaldamage = CLOTHING_ARMOR_LOW - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN - flags_jumpsuit = FALSE - -/obj/item/clothing/under/rank/orderly - desc = "A white suit to be worn by orderly people who love orderly things." - name = "orderly's uniform" - icon_state = "orderly" - permeability_coefficient = 0.50 - armor_melee = CLOTHING_ARMOR_NONE - armor_bullet = CLOTHING_ARMOR_NONE - armor_laser = CLOTHING_ARMOR_NONE - armor_energy = CLOTHING_ARMOR_NONE - armor_bomb = CLOTHING_ARMOR_NONE - armor_bio = CLOTHING_ARMOR_LOW - armor_rad = CLOTHING_ARMOR_LOW - armor_internaldamage = CLOTHING_ARMOR_LOW - flags_jumpsuit = FALSE - item_state_slots = list(WEAR_BODY = "orderly") - /obj/item/clothing/under/rank/medical desc = "They're made of a special fiber that provides minor protection against biohazards. They have a cross on the chest denoting that the wearer is trained medical personnel." name = "medical doctor's uniform" diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index 728641492c0..2c703eee03d 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -655,10 +655,8 @@ has_sensor = UNIFORM_NO_SENSORS /obj/item/clothing/under/colonist - name = "colonist uniform" - desc = "A stylish gray-green jumpsuit - standard issue for colonists." - icon_state = "colonist" - worn_state = "colonist" + name = "abstract colonist" + desc = "Don't spawn this!" has_sensor = UNIFORM_HAS_SENSORS sensor_faction = FACTION_COLONIST @@ -701,6 +699,7 @@ desc = "A light-blue boilersuit." icon_state = "boilersuit_lightblue" worn_state = "boilersuit_lightblue" + flags_jumpsuit = UNIFORM_JACKET_REMOVABLE /obj/item/clothing/under/colonist/boilersuit/darkblue name = "dark-blue boilersuit" @@ -746,15 +745,6 @@ worn_state = "prison_boiler" flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE -/obj/item/clothing/under/colonist/ua_boiler - name = "\improper UA blue operations uniform" - desc = "A stylish blue jumpsuit - standard issue for UA civilian support personnel." - icon_state = "ua_boiler" - worn_state = "ua_boiler" - flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE - has_sensor = UNIFORM_HAS_SENSORS - sensor_faction = FACTION_MARINE - /obj/item/clothing/under/colonist/ua_civvies name = "\improper UA gray utility uniform" desc = "A stylish gray jumpsuit - standard issue for UA civilian support personnel." @@ -915,6 +905,18 @@ icon_state = "corporate_blue" worn_state = "corporate_blue" +/obj/item/clothing/under/liaison_suit/grey + name = "grey suit pants" + desc = "A pair of grey slacks paired with a white shirt. A common pairing among corporate workers." + icon_state = "corporate_grey" + worn_state = "corporate_grey" + +/obj/item/clothing/under/liaison_suit/khaki + name = "khaki suit pants" + desc = "A pair of khaki slacks paired with a white shirt. A common pairing among corporate workers." + icon_state = "corporate_khaki" + worn_state = "corporate_khaki" + /obj/item/clothing/under/marine/reporter name = "combat correspondent uniform" desc = "A relaxed and robust uniform fit for any potential reporting needs." @@ -1286,9 +1288,26 @@ desc = "The uniform of an engineering technician. Specially treated for hazardous materials handing and hostile conditions, with reinforced material around the elbows and knees." armor_bio = CLOTHING_ARMOR_LOW armor_rad = CLOTHING_ARMOR_LOW - icon_state = "ua_boiler" - worn_state = "ua_boiler" - suit_restricted = null //so most officers can wear whatever suit they want + armor_bomb = CLOTHING_ARMOR_MEDIUM + icon_state = "mt_jumpsuit" + worn_state = "mt_jumpsuit" + flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE + flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE + item_state_slots = list(WEAR_BODY = "mt_jumpsuit") + +/obj/item/clothing/under/marine/officer/engi/OT/navy + name = "\improper damage-control crew uniform" + desc = "The uniform of an aerospace force crewman. Specially treated for hazardous materials handing and hostile conditions. This one has the color-flashes of a member of the ship damage-control teams on it." + icon_state = "ot_jumpsuit" + worn_state = "ot_jumpsuit" + item_state_slots = list(WEAR_BODY = "ot_jumpsuit") + flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE + +/obj/item/clothing/under/marine/officer/engi/navy/tech + name = "\improper engineering technician uniform" + desc = "The uniform of an aerospace force engineering technician. Specially treated for hazardous materials handing and hostile conditions, with reinforced material around the elbows and knees." + icon_state = "boilersuit_darkblue" + worn_state = "boilersuit_darkblue" flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE /obj/item/clothing/under/marine/officer/pilot/flight/para diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm index dcba2de7504..cf34ced0793 100644 --- a/code/modules/gear_presets/_select_equipment.dm +++ b/code/modules/gear_presets/_select_equipment.dm @@ -139,12 +139,12 @@ mob_client = new_human.client var/obj/item/card/id/ID = new idtype() ID.name = "[new_human.real_name]'s [ID.card_name]" - if(assignment) - ID.name += " ([assignment])" + if(get_assignment(new_human)) + ID.name += " ([get_assignment(new_human)])" ID.access = access.Copy(1, 0) ID.faction = faction ID.faction_group = faction_group.Copy() - ID.assignment = assignment + ID.assignment = get_assignment(new_human) ID.rank = rank ID.registered_name = new_human.real_name ID.registered_ref = WEAKREF(new_human) @@ -161,6 +161,9 @@ new_human.job = rank new_human.comm_title = role_comm_title +/datum/equipment_preset/proc/get_assignment(mob/living/carbon/human/new_human) + return assignment + /datum/equipment_preset/proc/load_languages(mob/living/carbon/human/new_human, client/mob_client) new_human.set_languages(languages) @@ -831,7 +834,7 @@ GLOBAL_LIST_INIT(rebel_rifles, list( new_human.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/trainee(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) if(4) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/boilersuit/cyan(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) /datum/equipment_preset/proc/add_random_survivor_medical_gear(mob/living/carbon/human/new_human) // Randomized medical gear. Survivors wont have their gear all kitted out once the outbreak began much like a doctor on a coffee break wont carry their instruments around. This is a generation of items they may or maynot get when the outbreak happens @@ -967,24 +970,6 @@ GLOBAL_LIST_INIT(rebel_rifles, list( * Some weapons may not appear at all in a colony so they will need the extra ammo. * MERC, and DB needed a handfull of shells to compete with the normal CMB. */ -/datum/equipment_preset/proc/add_survivor_weapon_civilian(mob/living/carbon/human/new_human) - // a high chance to just not have a primary weapon - if(prob(60)) - return - var/random_weapon = rand(0,3) - switch(random_weapon) - if(0) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/boltaction(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/boltaction(new_human), WEAR_WAIST) - if(1) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/uzi(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/uzi(new_human), WEAR_WAIST) - if(2) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/shotgun_ammo, WEAR_WAIST) - if(3) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/ar10(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/ar10(new_human), WEAR_WAIST) /datum/equipment_preset/proc/add_survivor_weapon_security(mob/living/carbon/human/new_human) // Randomizes the primary weapon a survivor might find at the start of the outbreak in a gun cabinet. @@ -1074,71 +1059,240 @@ GLOBAL_LIST_INIT(rebel_rifles, list( list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR) ) +/datum/equipment_preset/proc/add_random_satchel(mob/living/carbon/human/new_human) + var/random_satchel = rand(1,3) + switch(random_satchel) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/blue(new_human), WEAR_BACK) + + //Civilian + +/datum/equipment_preset/proc/add_civilian_shoe(mob/living/carbon/human/new_human) + var/random_civilian_shoe = rand(1,10) + switch(random_civilian_shoe) + if(1 to 2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) + if(3 to 4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + if(5 to 7) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian/brown(new_human), WEAR_FEET) + if(8) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian(new_human), WEAR_FEET) + if(9) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup/brown(new_human), WEAR_FEET) + if(10) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/stompers(new_human), WEAR_FEET) + +/datum/equipment_preset/proc/add_civilian_uniform(mob/living/carbon/human/new_human) + var/random_civilian = rand(1,9) + switch(random_civilian) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/boilersuit/khaki(new_human), WEAR_BODY) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/boilersuit/cyan(new_human), WEAR_BODY) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/boilersuit/grey(new_human), WEAR_BODY) + if(4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/blue(new_human), WEAR_BODY) + if(5) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/khaki(new_human), WEAR_BODY) + if(6) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/pink(new_human), WEAR_BODY) + if(7) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/green(new_human), WEAR_BODY) + if(8) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/brown(new_human), WEAR_BODY) + if(9) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue(new_human), WEAR_BODY) + +/datum/equipment_preset/proc/add_civilian_jacket(mob/living/carbon/human/new_human) + var/random_civilian_jacket = rand(1,12) + switch(random_civilian_jacket) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/corporate/brown(new_human), WEAR_JACKET) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/corporate/blue(new_human), WEAR_JACKET) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/corporate(new_human), WEAR_JACKET) + if(4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/windbreaker_yellow(new_human), WEAR_JACKET) + if(5) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/windbreaker_brown(new_human), WEAR_JACKET) + if(6) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/windbreaker_blue(new_human), WEAR_JACKET) + if(7) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/windbreaker_green(new_human), WEAR_JACKET) + if(8) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/vest(new_human), WEAR_JACKET) + if(9) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/vest/tan(new_human), WEAR_JACKET) + if(10) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/vest/grey(new_human), WEAR_JACKET) + if(11) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls(new_human), WEAR_JACKET) + if(12) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls/tan(new_human), WEAR_JACKET) + +//Workers + +/datum/equipment_preset/proc/add_worker_uniform(mob/living/carbon/human/new_human) + var/random_worker = rand(1,7) + switch(random_worker) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/boilersuit/khaki(new_human), WEAR_BODY) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/boilersuit/cyan(new_human), WEAR_BODY) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/boilersuit/grey(new_human), WEAR_BODY) + if(4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/blue(new_human), WEAR_BODY) + if(5) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/khaki(new_human), WEAR_BODY) + if(6) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/pink(new_human), WEAR_BODY) + if(7) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/green(new_human), WEAR_BODY) -/datum/equipment_preset/proc/load_upp_shotgun(mob/living/carbon/human/new_human) +/datum/equipment_preset/proc/add_worker_jacket(mob/living/carbon/human/new_human) + var/random_worker_jacket = rand(1,4) + switch(random_worker_jacket) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls(new_human), WEAR_JACKET) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls/tan(new_human), WEAR_JACKET) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/windbreaker_yellow(new_human), WEAR_JACKET) + if(4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/type23, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavybuck, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavybuck, WEAR_R_STORE) +/datum/equipment_preset/proc/add_worker_shoe(mob/living/carbon/human/new_human) + var/random_worker_shoe = rand(1,2) + switch(random_worker_shoe) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian/brown(new_human), WEAR_FEET) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian(new_human), WEAR_FEET) -/datum/equipment_preset/proc/add_upp_weapon(mob/living/carbon/human/new_human) - var/random_gun = rand(1,5) - switch(random_gun) - if(1, 2) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71(new_human), WEAR_IN_BACK) +/datum/equipment_preset/proc/add_worker_gloves(mob/living/carbon/human/new_human) + var/random_workgloves = rand(1,3) + switch(random_workgloves) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/light_brown(new_human), WEAR_HANDS) if(3) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/carbine(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/brown(new_human), WEAR_HANDS) + +/datum/equipment_preset/proc/add_business_outfit(mob/living/carbon/human/new_human) + + var/random_business_outfit = rand(1,4) + switch(random_business_outfit) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/brown(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/corporate/brown(new_human), WEAR_JACKET) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/corporate/blue(new_human), WEAR_JACKET) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/corporate/black(new_human), WEAR_JACKET) if(4) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/type23(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/heavy/buckshot(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/heavy/buckshot(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/heavy/buckshot(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/grey(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/corporate/grey(new_human), WEAR_JACKET) + +/datum/equipment_preset/proc/add_professionalwear(mob/living/carbon/human/new_human) + var/random_professionalwear = rand(1,4) + switch(random_professionalwear) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/brown(new_human), WEAR_BODY) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue(new_human), WEAR_BODY) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black(new_human), WEAR_BODY) + if(4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/grey(new_human), WEAR_BODY) + +/datum/equipment_preset/proc/add_dress_shoes(mob/living/carbon/human/new_human) + var/random_professional_shoe = rand(1,2) + switch(random_professional_shoe) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup/brown(new_human), WEAR_FEET) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + +/datum/equipment_preset/proc/add_tie(mob/living/carbon/human/new_human) + var/random_tie = rand(1,5) + switch(random_tie) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/black(new_human), WEAR_ACCESSORY) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/blue(new_human), WEAR_ACCESSORY) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/green(new_human), WEAR_ACCESSORY) + if(4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/purple(new_human), WEAR_ACCESSORY) if(5) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/bizon(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/bizon(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/bizon(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/bizon(new_human), WEAR_IN_BACK) - -/datum/equipment_preset/proc/spawn_random_upp_headgear(mob/living/carbon/human/new_human) - var/random_hat = rand(1,10) - switch(random_hat) - if (1, 2) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP(new_human), WEAR_HEAD) - if (3, 4, 5) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap(new_human), WEAR_HEAD) - if (6, 7) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret(new_human), WEAR_HEAD) - if (8, 9) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/ushanka(new_human), WEAR_HEAD) - -/datum/equipment_preset/proc/spawn_random_upp_armor(mob/living/carbon/human/new_human) - var/random_gear = rand(1, 5) - switch(random_gear) - if (1, 2, 3) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP (new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/webbing(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_J_STORE) - if (4) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP (new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET) - if (5) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP (new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/light(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET) - -/datum/equipment_preset/proc/spawn_random_upp_belt(mob/living/carbon/human/new_human) - var/random_gun = rand(1, 4) - switch(random_gun) - if (1 to 2) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/np92(new_human), WEAR_WAIST) - if (3) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/t73(new_human), WEAR_WAIST) - if (4) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/upp(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/red(new_human), WEAR_ACCESSORY) + +/datum/equipment_preset/proc/add_boilersuit(mob/living/carbon/human/new_human) + var/random_boilersuit = rand(1,4) + switch(random_boilersuit) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/boilersuit/khaki(new_human), WEAR_BODY) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/boilersuit/cyan(new_human), WEAR_BODY) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/boilersuit/grey(new_human), WEAR_BODY) + if(4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/boilersuit(new_human), WEAR_BODY) + +/datum/equipment_preset/proc/add_facewrap(mob/living/carbon/human/new_human) + var/random_face_wrap = rand(1,6) + switch(random_face_wrap) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/tan(new_human), WEAR_FACE) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/red(new_human), WEAR_FACE) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask(new_human), WEAR_FACE) + if(4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green(new_human), WEAR_FACE) + if(5) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/black(new_human), WEAR_FACE) + if(6) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/delta(new_human), WEAR_FACE) + + //UPP +/datum/equipment_preset/proc/add_upp_head(mob/living/carbon/human/new_human) + var/maybeberet = rand(1,3) + switch(maybeberet) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/upp, WEAR_HEAD) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/upp/alt, WEAR_HEAD) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD) + +/datum/equipment_preset/proc/add_upp_uniform(mob/living/carbon/human/new_human) + var/obj/item/clothing/under/marine/veteran/UPP/uniform = new() + var/random_uniform = rand(1,2) + switch(random_uniform) + if(1) + uniform.roll_suit_jacket(new_human) + if(2) + uniform.roll_suit_sleeves(new_human) + new_human.equip_to_slot_or_del(uniform, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY) + +/datum/equipment_preset/proc/add_money_poor(mob/living/carbon/human/new_human) + var/obj/item/spacecash/bundle/money = new /obj/item/spacecash/bundle + money.worth = 50 + money.update_icon() + new_human.equip_to_slot_or_del(money, WEAR_IN_BACK) + diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm index f144cc708b0..15567262b11 100644 --- a/code/modules/gear_presets/cmb.dm +++ b/code/modules/gear_presets/cmb.dm @@ -47,68 +47,55 @@ return ..() //*****************************************************************************************************/ - /datum/equipment_preset/cmb/standard - name = "CMB - Colonial Marshal Deputy" + name = "CMB - Colonial Marshals Deputy" paygrades = list(PAY_SHORT_CMBD = JOB_PLAYTIME_TIER_0) role_comm_title = "CMB DEP" flags = EQUIPMENT_PRESET_EXTRA - assignment = "CMB Deputy" + assignment = "Office of Colonial Marshals Deputy" rank = JOB_CMB skills = /datum/skills/cmb /datum/equipment_preset/cmb/standard/load_gear(mob/living/carbon/human/new_human) var/choice = rand(1,10) + var/rig_or_jacket = rand(1,4) + new_human.undershirt = "undershirt" new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/spearhead, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/full/revolver, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_IN_BACK) + + switch(rig_or_jacket) + if(1 to 3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB, WEAR_JACKET) + if(4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/lamp, WEAR_JACKET) switch(choice) if(1 to 6) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/spearhead, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/full/revolver, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) - if(7 to 9) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/full/highpower, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge/rubber, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) + if(7 to 9) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m20a, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m20a, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m20a, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m20a, WEAR_IN_R_STORE) if(10) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/spearhead, WEAR_IN_ACCESSORY) @@ -116,27 +103,22 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/full/revolver, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_R_STORE) - //*****************************************************************************************************/ /datum/equipment_preset/cmb/leader - name = "CMB - The Colonial Marshal" + name = "CMB - Colonial Marshal" paygrades = list(PAY_SHORT_CMBM = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/marshal role_comm_title = "CMB MAR" flags = EQUIPMENT_PRESET_EXTRA - assignment = "CMB Marshal" + assignment = "Marshal" rank = JOB_CMB_TL skills = /datum/skills/cmb/leader minimum_age = 30 @@ -144,6 +126,7 @@ /datum/equipment_preset/cmb/leader/load_gear(mob/living/carbon/human/new_human) //clothes + new_human.undershirt = "undershirt" new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) @@ -151,25 +134,25 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/marshal, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb/m3717, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/full/revolver, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) //pouches - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot/incendiary, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/incendiary, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + //backpack new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/tnr, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_IN_BACK) @@ -382,226 +365,3 @@ new_human.equip_to_slot_or_del(new /obj/item/clipboard, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - - -//############ Anchorpoint Station Colonial Marines - They serve as reinforcements for the Colonial Marshals of Anchorpoint Station. ############# -//Anchorpoint Station Squad Marine - Similar to the Movie squad but nerfed a bit. - -/datum/equipment_preset/uscm/cmb - name = "USCM Anchorpoint Station Squad Marine" - flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE - -/datum/equipment_preset/uscm/cmb/New() - . = ..() - access = get_access(ACCESS_LIST_UA) - - assignment = "Anchorpoint Station Marine Rifleman" - rank = JOB_SQUAD_MARINE - paygrades = list(PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_0) - role_comm_title = "A-RFN" - skills = /datum/skills/pfc - faction = FACTION_MARSHAL - faction_group = list(FACTION_MARSHAL, FACTION_MARINE) - -/datum/equipment_preset/uscm/cmb/load_status(mob/living/carbon/human/new_human) - . = ..() - new_human.nutrition = rand(NUTRITION_MAX, NUTRITION_NORMAL) - -/datum/equipment_preset/uscm/cmb/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/hp, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/rubber, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/military, WEAR_IN_HELMET) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_HELMET) - new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_HELMET) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/weapon/baton/cattleprod, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_box/rounds, WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_R_HAND) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/anchorpoint/gl, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41amk1, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/high_explosive, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/high_explosive, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) - -//Anchorpoint Station Marine Squad Leader - -/datum/equipment_preset/uscm/cmb/leader - name = "USCM Anchorpoint Station Team Leader" - flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE - assignment = "Anchorpoint Station Marine Team Leader" - rank = JOB_SQUAD_LEADER - paygrades = list(PAY_SHORT_ME6 = JOB_PLAYTIME_TIER_0) - role_comm_title = "A-TL" - minimum_age = 25 - skills = /datum/skills/SL - -/datum/equipment_preset/uscm/cmb/leader/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3/custom, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/hp, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/rubber, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/m37, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/sensor, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/leader, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/military, WEAR_IN_HELMET) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_HELMET) - new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_HELMET) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/lead, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium/leader, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/anchorpoint, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) // he's collected the squad's supply of these magazines on request of OW - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/shotgun/buckshot, WEAR_L_HAND) - -//Anchorpoint Station Marine RTO - technical specialist, has the responsibility of engineering as well -/datum/equipment_preset/uscm/cmb/rto - name = "USCM Anchorpoint Station Technical Specialist" - flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE - assignment = "Anchorpoint Station Marine Technical Specialist" - rank = JOB_SQUAD_TEAM_LEADER - paygrades = list(PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_0) - role_comm_title = "A-TS" - skills = /datum/skills/tl - -/datum/equipment_preset/uscm/cmb/rto/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/rto, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/hp, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/rubber, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/rto, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/military, WEAR_IN_HELMET) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_HELMET) - new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_HELMET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/tl, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium/rto, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/rto, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/anchorpoint, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) - -//Anchorpoint Station Corpsman -/datum/equipment_preset/uscm/cmb/medic - name = "USCM Anchorpoint Station Corpsman" - flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE - assignment = "Anchorpoint Station Hospital Corpsman" - rank = JOB_SQUAD_MEDIC - paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) - role_comm_title = "A-HM" - skills = /datum/skills/combat_medic - - utility_under = list(/obj/item/clothing/under/marine/medic) - -/datum/equipment_preset/uscm/cmb/medic/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/medic, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/hp, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/rubber, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/medic, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/military, WEAR_IN_HELMET) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_HELMET) - new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_HELMET) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/med, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/medic, WEAR_BACK) - if(prob(50)) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical, WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/adrenaline, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/adrenaline, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/anchorpoint, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/imidazoline, WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full, WEAR_R_STORE) - -//Anchorpoint Station Marine Smartgunnner -/datum/equipment_preset/uscm/cmb/smartgunner - name = "USCM Anchorpoint Station Smartgunner" - flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE - assignment = "Anchorpoint Station Marine Smartgunner" - rank = JOB_SQUAD_SMARTGUN - paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) - role_comm_title = "A-SG" - skills = /datum/skills/smartgunner - -/datum/equipment_preset/uscm/cmb/smartgunner/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3/custom, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/hp, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/rubber, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/smartgunner/full/, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/headband/red, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision, WEAR_EYES) diff --git a/code/modules/gear_presets/colonist.dm b/code/modules/gear_presets/colonist.dm index a5b33c428f2..89c56c13d9d 100644 --- a/code/modules/gear_presets/colonist.dm +++ b/code/modules/gear_presets/colonist.dm @@ -1,94 +1,751 @@ /datum/equipment_preset/colonist - name = JOB_COLONIST + name = FACTION_COLONIST + languages = list(LANGUAGE_ENGLISH) + faction = FACTION_COLONIST + skills = /datum/skills/civilian + idtype = /obj/item/card/id/lanyard + origin_override = ORIGIN_CIVILIAN + +/datum/equipment_preset/colonist/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(50;MALE,50;FEMALE) + var/datum/preferences/A = new + A.randomize_appearance(new_human) + var/random_name = capitalize(pick(new_human.gender == MALE ? GLOB.first_names_male : GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names)) + var/static/list/colors = list("BLACK" = list(15, 15, 10), "BROWN" = list(48, 38, 18), "BROWN" = list(48, 38, 18),"BLUE" = list(29, 51, 65), "GREEN" = list(40, 61, 39), "STEEL" = list(46, 59, 54)) + var/static/list/hair_colors = list("BLACK" = list(15, 15, 10), "BROWN" = list(48, 38, 18), "AUBURN" = list(77, 48, 36), "BLONDE" = list(95, 76, 44)) + var/hair_color = pick(hair_colors) + new_human.r_hair = hair_colors[hair_color][1] + new_human.g_hair = hair_colors[hair_color][2] + new_human.b_hair = hair_colors[hair_color][3] + new_human.r_facial = hair_colors[hair_color][1] + new_human.g_facial = hair_colors[hair_color][2] + new_human.b_facial = hair_colors[hair_color][3] + var/eye_color = pick(colors) + new_human.r_eyes = colors[eye_color][1] + new_human.g_eyes = colors[eye_color][2] + new_human.b_eyes = colors[eye_color][3] + if(new_human.gender == MALE) + new_human.h_style = pick("Undercut, Top", "Partly Shaved", "CIA", "Mulder", "Medium Fade", "High Fade", "Pixie Cut Left", "Pixie Cut Right", "Coffee House Cut") + new_human.f_style = pick("Shaved", "Shaved", "Shaved", "Shaved", "Shaved", "Shaved", "3 O'clock Shadow", "3 O'clock Shadow", "3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",) + else + new_human.h_style = pick("Undercut, Top", "CIA", "Mulder", "Pixie Cut Left", "Pixie Cut Right", "Scully", "Pvt. Redding", "Bun", "Short Bangs") + new_human.change_real_name(new_human, random_name) + new_human.age = rand(20,40) + +/datum/equipment_preset/colonist/bluecollar + + name = "Civilian Colonist, Blue-Collar" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian + access = list(ACCESS_CIVILIAN_PUBLIC) + +/datum/equipment_preset/colonist/bluecollar/get_assignment(mob/living/carbon/human/new_human) + if(prob(50)) + return "Class D Inhabitant" + + return "Class C Inhabitant" + +/datum/equipment_preset/colonist/bluecollar/load_gear(mob/living/carbon/human/new_human) + + new_human.undershirt = "undershirt" + //back + add_random_satchel(new_human) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //uniform + add_civilian_uniform(new_human) + //jacket + add_civilian_jacket(new_human) + //limbs + add_civilian_shoe(new_human) + +/datum/equipment_preset/colonist/miner + + name = "Civilian Colonist, Blue-Collar (Miner)" + assignment = "Miner" flags = EQUIPMENT_PRESET_EXTRA - assignment = JOB_COLONIST - rank = JOB_COLONIST faction = FACTION_COLONIST + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian + access = list(ACCESS_CIVILIAN_PUBLIC) +/datum/equipment_preset/colonist/miner/load_gear(mob/living/carbon/human/new_human) + new_human.undershirt = "undershirt" + + //back + add_random_satchel(new_human) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //head + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat(new_human), WEAR_HEAD) + //uniform + add_worker_uniform(new_human) + //jacket + add_worker_jacket(new_human) + //limbs + add_worker_shoe(new_human) + +/datum/equipment_preset/colonist/bluecollar/spanish + name = "Civilian Colonist, Blue-Collar (Spanish)" + languages = list(LANGUAGE_SPANISH) + +/datum/equipment_preset/colonist/construction + name = "Civilian Colonist, Blue-Collar (Construction)" + assignment = "Construction Worker" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian access = list(ACCESS_CIVILIAN_PUBLIC) + +/datum/equipment_preset/colonist/construction/load_gear(mob/living/carbon/human/new_human) + + new_human.undershirt = "undershirt" + //back + add_random_satchel(new_human) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //head + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat(new_human), WEAR_HEAD) + //uniform + add_worker_uniform(new_human) + //jacket + add_worker_jacket(new_human) + //limbs + add_worker_shoe(new_human) + +/datum/equipment_preset/colonist/roughneck + name = "Civilian Colonist, Blue-Collar (Roughneck)" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) skills = /datum/skills/civilian - idtype = /obj/item/card/id/lanyard + access = list(ACCESS_CIVILIAN_PUBLIC) - minimap_icon = "surv" - minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN +/datum/equipment_preset/colonist/roughneck/get_assignment(mob/living/carbon/human/new_human) + if(prob(50)) + return "Driller" + if(prob(50)) + return "Derrickhand" + if(prob(50)) + return "Chainhand" + return "Floorhand" -/datum/equipment_preset/colonist/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) - new_human.equip_to_slot(new /obj/item/attachable/bayonet(new_human), WEAR_L_STORE) - new_human.equip_to_slot(new /obj/item/device/flashlight(new_human), WEAR_R_STORE) +/datum/equipment_preset/colonist/roughneck/load_gear(mob/living/carbon/human/new_human) -/datum/equipment_preset/survivor/load_id(mob/living/carbon/human/new_human, client/mob_client) - var/obj/item/clothing/under/uniform = new_human.w_uniform - if(istype(uniform)) - uniform.has_sensor = UNIFORM_HAS_SENSORS - uniform.sensor_faction = FACTION_COLONIST - return ..() + new_human.undershirt = "undershirt" + //back + add_random_satchel(new_human) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + add_facewrap(new_human) + //head + var/random_roughneck_hardhat = rand(1,2) + switch(random_roughneck_hardhat) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/dblue(new_human), WEAR_HEAD) + //uniform + add_worker_uniform(new_human) + //jacket + add_worker_jacket(new_human) + //limbs + add_worker_gloves(new_human) + add_worker_shoe(new_human) -//*****************************************************************************************************/ +/datum/equipment_preset/colonist/roughneck/spanish + name = "Civilian Colonist, Blue-Collar (Roughneck, Spanish)" + languages = list(LANGUAGE_SPANISH) -/datum/equipment_preset/colonist/engineer - name = "Colonist - Engineer" +/datum/equipment_preset/colonist/cook + name = "Civilian Colonist, Blue-Collar (Cook)" + assignment = "Cook" flags = EQUIPMENT_PRESET_EXTRA - assignment = "Colonial Engineer" + faction = FACTION_COLONIST + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian + access = list(ACCESS_CIVILIAN_PUBLIC) - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_ENGINEERING) - skills = /datum/skills/OT +/datum/equipment_preset/colonist/cook/load_gear(mob/living/carbon/human/new_human) -/datum/equipment_preset/colonist/engineer/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/eng(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) + new_human.undershirt = "undershirt" + //back + add_random_satchel(new_human) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //uniform + var/obj/item/clothing/under/colonist/workwear/khaki/uniform = new() + uniform.roll_suit_jacket(new_human) + new_human.equip_to_slot_or_del(uniform, WEAR_BODY) + //jacket + new_human.equip_to_slot_or_del(new/obj/item/clothing/suit/chef/classic, WEAR_JACKET) + //limbs + add_worker_shoe(new_human) - new_human.equip_to_slot(new /obj/item/attachable/bayonet(new_human), WEAR_L_STORE) - new_human.equip_to_slot(new /obj/item/device/flashlight(new_human), WEAR_R_STORE) +/datum/equipment_preset/colonist/cook/spanish + name = "Civilian Colonist, Blue-Collar (Cook, Spanish)" + languages = list(LANGUAGE_SPANISH) -//*****************************************************************************************************/ +/datum/equipment_preset/colonist/chef + name = "Civilian Colonist, Blue-Collar (Chef)" + assignment = "Chef" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian + access = list(ACCESS_CIVILIAN_PUBLIC) -/datum/equipment_preset/colonist/security - name = "Colonist - Security" +/datum/equipment_preset/colonist/chef/load_gear(mob/living/carbon/human/new_human) + + new_human.undershirt = "undershirt" + //back + add_random_satchel(new_human) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //uniform + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black(new_human), WEAR_BODY) + //jacket + new_human.equip_to_slot_or_del(new/obj/item/clothing/suit/chef, WEAR_JACKET) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + +/datum/equipment_preset/colonist/priest + name = "Civilian Colonist, Priest" + assignment = "Spiritual Guidance Counselor" flags = EQUIPMENT_PRESET_EXTRA - assignment = "Colonial Security" + faction = FACTION_COLONIST + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian + access = list(ACCESS_CIVILIAN_PUBLIC) - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_ENGINEERING, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_RESEARCH) - skills = /datum/skills/MP +/datum/equipment_preset/colonist/priest/load_gear(mob/living/carbon/human/new_human) -/datum/equipment_preset/colonist/security/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/sec(new_human), WEAR_HEAD) + new_human.undershirt = "undershirt" + //back + add_random_satchel(new_human) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //uniform + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(new_human), WEAR_BODY) + //jacket + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/corporate/black(new_human), WEAR_JACKET) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + +/datum/equipment_preset/colonist/whitecollar + name = "Civilian Colonist, White-Collar" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian + access = list(ACCESS_CIVILIAN_PUBLIC) + +/datum/equipment_preset/colonist/whitecollar/get_assignment(mob/living/carbon/human/new_human) + if(prob(50)) + return "Class B Inhabitant" - new_human.equip_to_slot(new /obj/item/attachable/bayonet(new_human), WEAR_L_STORE) - new_human.equip_to_slot(new /obj/item/device/flashlight(new_human), WEAR_R_STORE) + return "Class A Inhabitant" -//*****************************************************************************************************/ +/datum/equipment_preset/colonist/whitecollar/load_gear(mob/living/carbon/human/new_human) + + new_human.undershirt = "undershirt" + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //back + add_random_satchel(new_human) + //outfit + add_business_outfit(new_human) + var/random_tie = rand(1,2) + switch(random_tie) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/black(new_human), WEAR_ACCESSORY) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/blue(new_human), WEAR_ACCESSORY) + //limb + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + +/datum/equipment_preset/colonist/whitecollar/exec + name = "Civilian Colonist, White-Collar (Corporate Exec)" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian + access = list(ACCESS_CIVILIAN_PUBLIC) + idtype = /obj/item/card/id/silver + +/datum/equipment_preset/colonist/whitecollar/exec/get_assignment(mob/living/carbon/human/new_human) + if(prob(25)) + return "Senior Executive" + + return "Executive" + +/datum/equipment_preset/colonist/whitecollar/exec/load_gear(mob/living/carbon/human/new_human) + + new_human.undershirt = "undershirt" + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //back + add_random_satchel(new_human) + //outfit + add_business_outfit(new_human) + var/random_tie = rand(1,2) + switch(random_tie) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/black(new_human), WEAR_ACCESSORY) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/blue(new_human), WEAR_ACCESSORY) + //limb + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/briefcase(new_human), WEAR_L_HAND) + +/datum/equipment_preset/colonist/researcher + name = "Civilian Researcher" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + assignment = "Research Associate" + paygrades = list(PAY_SHORT_CCMO = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/researcher + access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_RESEARCH, ACCESS_WY_GENERAL, ACCESS_WY_COLONIAL, ACCESS_WY_RESEARCH) + idtype = /obj/item/card/id/silver + +/datum/equipment_preset/colonist/researcher/load_gear(mob/living/carbon/human/new_human) + + new_human.undershirt = "undershirt" + //back + add_random_satchel(new_human) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //uniform + add_professionalwear(new_human) + var/random_tie= rand(1,5) + switch(random_tie) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/black(new_human), WEAR_ACCESSORY) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/blue(new_human), WEAR_ACCESSORY) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/green(new_human), WEAR_ACCESSORY) + if(4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/purple(new_human), WEAR_ACCESSORY) + if(5) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/red(new_human), WEAR_ACCESSORY) + //jacket + var/random_researcher_suit = rand(1,5) + switch(random_researcher_suit) + if(1 to 2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(new_human), WEAR_JACKET) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/vest/tan(new_human), WEAR_JACKET) + if(4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/vest(new_human), WEAR_JACKET) + if(5) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/vest/grey(new_human), WEAR_JACKET) + //limb + add_dress_shoes(new_human) /datum/equipment_preset/colonist/doctor - name = "Colonist - Doctor" + name = "Civilian Doctor" flags = EQUIPMENT_PRESET_EXTRA - assignment = "Colonial Doctor" + faction = FACTION_COLONIST + assignment = "Medical Doctor" paygrades = list(PAY_SHORT_CDOC = JOB_PLAYTIME_TIER_0) - - //Marine access is required to use chem dispensers... - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_RESEARCH, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE) - skills = /datum/skills/doctor + skills = /datum/skills/civilian/survivor/doctor + access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_MEDBAY) + idtype = /obj/item/card/id/silver /datum/equipment_preset/colonist/doctor/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/med(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(new_human), WEAR_BODY) + + new_human.undershirt = "undershirt" + //back + add_random_satchel(new_human) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //uniform + add_professionalwear(new_human) + add_tie(new_human) + //jacket + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(new_human), WEAR_JACKET) + //limb + add_dress_shoes(new_human) + +/datum/equipment_preset/colonist/doctor/scrubs + name = "Civilian Doctor, Scrubs" + +/datum/equipment_preset/colonist/doctor/scrubs/load_gear(mob/living/carbon/human/new_human) + + new_human.undershirt = "undershirt" + //back + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/blue(new_human), WEAR_BACK) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //uniform + var/random_scrubs= rand(1,4) + switch(random_scrubs) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/green(new_human), WEAR_BODY) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/blue(new_human), WEAR_BODY) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(new_human), WEAR_BODY) + if(4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/lightblue(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/stethoscope(new_human), WEAR_ACCESSORY) + //limb new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) - new_human.equip_to_slot(new /obj/item/attachable/bayonet(new_human), WEAR_L_STORE) - new_human.equip_to_slot(new /obj/item/device/flashlight(new_human), WEAR_R_STORE) +/datum/equipment_preset/colonist/admin + name = "Civilian Administrator" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + assignment = "Administrator" + role_comm_title = "ADMIN" + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian + access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_ENGINEERING, ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_COMMAND) + idtype = /obj/item/card/id/silver + +/datum/equipment_preset/colonist/admin/load_gear(mob/living/carbon/human/new_human) + + new_human.undershirt = "undershirt" + //back + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //outfit + add_business_outfit(new_human) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + +/datum/equipment_preset/colonist/cargo + name = "Civilian Logistics Worker" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + assignment = "Logistical Technician" + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian + access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_LOGISTICS) + +/datum/equipment_preset/colonist/cargo/load_gear(mob/living/carbon/human/new_human) + + new_human.undershirt = "undershirt" + //back + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //uniform + add_boilersuit(new_human) + //jacket + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(new_human), WEAR_JACKET) + //limb + var/random_cargo_shoe = rand(1,5) + switch(random_cargo_shoe) + if(1 to 2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian(new_human), WEAR_FEET) + if(3 to 4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian/brown(new_human), WEAR_FEET) + if(5) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) + add_worker_gloves(new_human) + +/datum/equipment_preset/colonist/technician + name = "Civilian Maintenance Technician" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + assignment = "Maintenance Technician" + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/MT + access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_ENGINEERING) + +/datum/equipment_preset/colonist/technician/load_gear(mob/living/carbon/human/new_human) + + new_human.undershirt = "undershirt" + //back + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //head + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/dblue(new_human), WEAR_HEAD) + //uniform + add_worker_uniform(new_human) + //jacket + add_worker_jacket(new_human) + //waist + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full, WEAR_WAIST) + //limb + add_worker_shoe(new_human) + add_worker_gloves(new_human) + +/datum/equipment_preset/colonist/engineer + name = "Civilian Engineer" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/MT + access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_ENGINEERING) + +/datum/equipment_preset/colonist/engineer/get_assignment(mob/living/carbon/human/new_human) + if(prob(85)) + return "Engineer" + return "Foreman" + +/datum/equipment_preset/colonist/engineer/load_gear(mob/living/carbon/human/new_human) + new_human.undershirt = "undershirt" + //back + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //head + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD) + //uniform + add_civilian_uniform(new_human) + //jacket + var/random_foreman_jacket= rand(1,4) + switch(random_foreman_jacket) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls(new_human), WEAR_JACKET) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls/tan(new_human), WEAR_JACKET) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/windbreaker_yellow(new_human), WEAR_JACKET) + if(4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/blue(new_human), WEAR_JACKET) + //waist + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full, WEAR_WAIST) + //limb + add_worker_shoe(new_human) + add_worker_gloves(new_human) + +/datum/equipment_preset/colonist/operations + name = "Civilian Operations Technician" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + assignment = "Operations Technician" + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian + access = list(ACCESS_UPP_GENERAL, ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_COMMAND) + +/datum/equipment_preset/colonist/operations/load_gear(mob/living/carbon/human/new_human) + + new_human.undershirt = "undershirt" + //back + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //uniform + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear(new_human), WEAR_BODY) + //limb + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + +/datum/equipment_preset/colonist/prisoner + name = "Prisoner" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + assignment = "Inmate" + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian + access = list(null) + idtype = /obj/item/card/id + +/datum/equipment_preset/colonist/prisoner/load_gear(mob/living/carbon/human/new_human) + + new_human.undershirt = "undershirt" + //uniform + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/prison_boiler(new_human), WEAR_BODY) + //limb + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) + +/datum/equipment_preset/colonist/security + name = "Civilian Security Guard, Generic" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + assignment = "Security Officer" + paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian/survivor/marshal + access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND) + +/datum/equipment_preset/colonist/security/load_gear(mob/living/carbon/human/new_human) + + new_human.undershirt = "undershirt" + //back + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //uniform + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/grey(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/black(new_human), WEAR_ACCESSORY) + //jacket + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/ballistic, WEAR_JACKET) + //waist + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/colonist, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol, WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol, WEAR_IN_BELT) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) + //pockets + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/alt, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3, WEAR_IN_R_STORE) + +/datum/equipment_preset/colonist/security/weyland + name = "Civilian Security Guard, Wey-Yu" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + faction_group = FACTION_LIST_WY_COLONY + assignment = "Weyland-Yutani Corporate Security Officer" + paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian/survivor/marshal + access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_SECURITY) + +/datum/equipment_preset/colonist/security/weyland/load_gear(mob/living/carbon/human/new_human) + + new_human.undershirt = "undershirt" + //back + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //uniform + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/blue(new_human), WEAR_ACCESSORY) + //jacket + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest, WEAR_JACKET) + //waist + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/colonist, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, WEAR_IN_BELT) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) + //pockets + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/alt, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70, WEAR_IN_R_STORE) + +/datum/equipment_preset/colonist/security/trijent + name = "Civilian Security Guard, Trijent Corp" + languages = list(LANGUAGE_JAPANESE, LANGUAGE_ENGLISH) + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + assignment = "Trijent Corporate Security Officer" + paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian/survivor/marshal + access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_SECURITY) + +/datum/equipment_preset/colonist/security/trijent/load_gear(mob/living/carbon/human/new_human) + + new_human.undershirt = "undershirt" + //back + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //uniform + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/blue(new_human), WEAR_ACCESSORY) + //jacket + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest, WEAR_JACKET) + //waist + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/colonist, WEAR_WAIST) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) + //pockets + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/alt, WEAR_R_STORE) + +/datum/equipment_preset/colonist/security/prison + name = "Civilian Security Guard, Prison" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + faction_group = FACTION_LIST_UA_COLONY + assignment = "Corrections Officer" + paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian/survivor/marshal + access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND) + idtype = /obj/item/card/id/silver + +/datum/equipment_preset/colonist/security/prison/load_gear(mob/living/carbon/human/new_human) + + new_human.undershirt = "undershirt" + //back + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //head + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/corrections, WEAR_HEAD) + //uniform + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/boilersuit/darkblue, WEAR_BODY) + //jacket + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/ballistic, WEAR_JACKET) + //waist + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/colonist, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol, WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol, WEAR_IN_BELT) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) + //pockets + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/alt, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3, WEAR_IN_R_STORE) + +/datum/equipment_preset/colonist/security/guard + name = "Civilian Security Guard, UA Colonial Guard" + flags = EQUIPMENT_PRESET_EXTRA + faction_group = FACTION_LIST_UA_COLONY + assignment = "Colonial Militiaman" + paygrades = list(PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian/survivor/marshal + access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_MARINE_PREP) + idtype = /obj/item/card/id/dogtag + +/datum/equipment_preset/colonist/security/guard/load_gear(mob/living/carbon/human/new_human) + + new_human.undershirt = "undershirt" + //back + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel, WEAR_BACK) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/guard, WEAR_L_EAR) + //head + var/maybecap = rand(1,3) + switch(maybecap) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield, WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/khaki, WEAR_IN_BACK) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/khaki, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield, WEAR_IN_BACK) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/khaki, WEAR_IN_BACK) + //uniform + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/boilersuit/khaki, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/ranks/marine/e2, WEAR_ACCESSORY) + //jacket + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/ballistic, WEAR_JACKET) + //waist + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/colonist, WEAR_WAIST) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) + add_worker_gloves(new_human) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m20a, WEAR_J_STORE) + + //pockets + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m20a, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m20a, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m20a, WEAR_IN_R_STORE) + +/datum/equipment_preset/colonist/security/guard/spanish + name = "Civilian Security Guard, UA Colonial Guard (Spanish)" + languages = list(LANGUAGE_SPANISH) + + //back + //face + //head + //uniform + //jacket + //waist + //limbs + //pockets diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index 0653fc45ff3..2df5f5cbd5c 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/code/modules/gear_presets/corpses.dm @@ -45,568 +45,373 @@ new_human.updatehealth() new_human.pulse = PULSE_NONE -/datum/equipment_preset/corpse/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) - add_random_survivor_equipment(new_human) - add_survivor_weapon_pistol(new_human) - -//*****************************************************************************************************/ - +/datum/equipment_preset/corpse/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(50;MALE,50;FEMALE) + var/datum/preferences/A = new + A.randomize_appearance(new_human) + var/random_name = capitalize(pick(new_human.gender == MALE ? GLOB.first_names_male : GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names)) + var/static/list/colors = list("BLACK" = list(15, 15, 10), "BROWN" = list(48, 38, 18), "BROWN" = list(48, 38, 18),"BLUE" = list(29, 51, 65), "GREEN" = list(40, 61, 39), "STEEL" = list(46, 59, 54)) + var/static/list/hair_colors = list("BLACK" = list(15, 15, 10), "BROWN" = list(48, 38, 18), "AUBURN" = list(77, 48, 36), "BLONDE" = list(95, 76, 44)) + var/hair_color = pick(hair_colors) + new_human.r_hair = hair_colors[hair_color][1] + new_human.g_hair = hair_colors[hair_color][2] + new_human.b_hair = hair_colors[hair_color][3] + new_human.r_facial = hair_colors[hair_color][1] + new_human.g_facial = hair_colors[hair_color][2] + new_human.b_facial = hair_colors[hair_color][3] + var/eye_color = pick(colors) + new_human.r_eyes = colors[eye_color][1] + new_human.g_eyes = colors[eye_color][2] + new_human.b_eyes = colors[eye_color][3] + if(new_human.gender == MALE) + new_human.h_style = pick("Undercut, Top", "Partly Shaved", "CIA", "Mulder", "Medium Fade", "High Fade", "Pixie Cut Left", "Pixie Cut Right", "Coffee House Cut") + new_human.f_style = pick("Shaved", "Shaved", "Shaved", "Shaved", "Shaved", "Shaved", "3 O'clock Shadow", "3 O'clock Shadow", "3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",) + else + new_human.h_style = pick("Undercut, Top", "CIA", "Mulder", "Pixie Cut Left", "Pixie Cut Right", "Scully", "Pvt. Redding", "Bun", "Short Bangs") + new_human.change_real_name(new_human, random_name) + new_human.age = rand(20,40) //*****************************************************************************************************/ // Civilians - -/datum/equipment_preset/corpse/prisoner - name = "Corpse - Prisoner" - assignment = "Prisoner" - -/datum/equipment_preset/corpse/prisoner/load_gear(mob/living/carbon/human/new_human) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(new_human), WEAR_FEET) - -//*****************************************************************************************************/ - -/datum/equipment_preset/corpse/chef - name = "Corpse - Chef" - assignment = "Chef" +/datum/equipment_preset/corpse/bluecollar + name = "Corpse - Blue-Collar" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian access = list(ACCESS_CIVILIAN_PUBLIC) -/datum/equipment_preset/corpse/chef/load_gear(mob/living/carbon/human/new_human) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chef(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/chef/classic(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/chefhat(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - -//*****************************************************************************************************/ - -/datum/equipment_preset/corpse/doctor - name = "Corpse - Doctor" - assignment = "Doctor" - idtype = /obj/item/card/id/silver/clearance_badge - xenovictim = TRUE - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_MEDBAY) - -/datum/equipment_preset/corpse/doctor/load_gear(mob/living/carbon/human/new_human) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/med(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/chef/classic/medical(new_human), WEAR_JACKET) - add_random_survivor_medical_gear(new_human) - -//*****************************************************************************************************/ +/datum/equipment_preset/corpse/bluecollar/get_assignment(mob/living/carbon/human/new_human) + if(prob(50)) + return "Class D Inhabitant" -/datum/equipment_preset/corpse/engineer - name = "Corpse - Engineer" - assignment = "Engineer" - xenovictim = TRUE - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_ENGINEERING) - -/datum/equipment_preset/corpse/engineer/load_gear(mob/living/carbon/human/new_human) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + return "Class C Inhabitant" -//*****************************************************************************************************/ +/datum/equipment_preset/corpse/bluecollar/load_gear(mob/living/carbon/human/new_human) + new_human.undershirt = "undershirt" + //back + add_random_satchel(new_human) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //uniform + add_civilian_uniform(new_human) + //jacket + add_civilian_jacket(new_human) + //limbs + add_civilian_shoe(new_human) -/datum/equipment_preset/corpse/scientist - name = "Corpse - Scientist" - assignment = "Scientist" - idtype = /obj/item/card/id/silver/clearance_badge/scientist +/datum/equipment_preset/corpse/bluecollar/burst + name = "Corpse - Blue-Collar (Burst)" xenovictim = TRUE - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_MEDBAY) - -/datum/equipment_preset/corpse/scientist/load_gear(mob/living/carbon/human/new_human) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/virologist(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/chem(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/green(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/good(new_human), WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector(new_human), WEAR_IN_BACK) -//*****************************************************************************************************/ +/datum/equipment_preset/corpse/whitecollar + name = "Corpse - White-Collar" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian + access = list(ACCESS_CIVILIAN_PUBLIC) -/datum/equipment_preset/corpse/miner - name = "Corpse - Shaft Miner" - assignment = "Shaft Miner" - xenovictim = TRUE - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_ENGINEERING) +/datum/equipment_preset/corpse/whitecollar/get_assignment(mob/living/carbon/human/new_human) + if(prob(50)) + return "Class B Inhabitant" -/datum/equipment_preset/corpse/miner/load_gear(mob/living/carbon/human/new_human) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/miner(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/industrial(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/yellow(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/orange(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + return "Class A Inhabitant" -//*****************************************************************************************************/ +/datum/equipment_preset/corpse/whitecollar/load_gear(mob/living/carbon/human/new_human) -/datum/equipment_preset/corpse/security - name = "Corpse - Security" - assignment = "Security Officer" - xenovictim = TRUE - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_COMMAND) - -/datum/equipment_preset/corpse/security/load_gear(mob/living/carbon/human/new_human) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - -//*****************************************************************************************************/ + new_human.undershirt = "undershirt" + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //back + add_random_satchel(new_human) + //outfit + add_business_outfit(new_human) + var/random_tie = rand(1,2) + switch(random_tie) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/black(new_human), WEAR_ACCESSORY) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/blue(new_human), WEAR_ACCESSORY) + //limb + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) -/datum/equipment_preset/corpse/security/cmb - name = "Corpse - Colonial Marshal Deputy" - rank = JOB_CMB - paygrades = list(PAY_SHORT_CMBD = JOB_PLAYTIME_TIER_0) - idtype = /obj/item/card/id/deputy +/datum/equipment_preset/corpse/whitecollar/burst + name = "Corpse - White-Collar (Burst)" xenovictim = TRUE - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) -/datum/equipment_preset/corpse/security/cmb/load_gear(mob/living/carbon/human/new_human) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/heavy(new_human), WEAR_WAIST) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - . = ..() - -//*****************************************************************************************************/ - -/datum/equipment_preset/corpse/liaison - name = "Corpse - Corporate Liaison" - assignment = JOB_EXECUTIVE - rank = JOB_EXECUTIVE - faction_group = FACTION_LIST_WY - paygrades = list(PAY_SHORT_WYC3 = JOB_PLAYTIME_TIER_0) - idtype = /obj/item/card/id/silver/clearance_badge/cl - xenovictim = TRUE - access = list( - ACCESS_WY_COLONIAL, - ACCESS_WY_EXEC, - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) +/datum/equipment_preset/corpse/researcher + name = "Corpse - Researcher" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + assignment = "Research Associate" + paygrades = list(PAY_SHORT_CCMO = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/researcher + access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_RESEARCH, ACCESS_WY_GENERAL, ACCESS_WY_COLONIAL, ACCESS_WY_RESEARCH) -/datum/equipment_preset/corpse/liaison/load_gear(mob/living/carbon/human/new_human) - var/random = rand(1,4) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/aviator(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp70(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - add_random_cl_survivor_loot(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) +/datum/equipment_preset/corpse/researcher/load_gear(mob/living/carbon/human/new_human) - switch(random) + new_human.undershirt = "undershirt" + //back + add_random_satchel(new_human) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //uniform + add_professionalwear(new_human) + var/random_tie= rand(1,5) + switch(random_tie) if(1) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/black(new_human), WEAR_ACCESSORY) if(2) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/brown(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/blue(new_human), WEAR_ACCESSORY) if(3) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/corporate_formal(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/green(new_human), WEAR_ACCESSORY) if(4) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET) - - . = ..() - -//*****************************************************************************************************/ - -/datum/equipment_preset/corpse/prison_guard - name = "Corpse - Prison Guard" - assignment = "Prison Guard" - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) - -/datum/equipment_preset/corpse/prison_guard/load_gear(mob/living/carbon/human/new_human) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - -//*****************************************************************************************************/ - /////////////////Officers////////////////////// - -/datum/equipment_preset/corpse/manager - name = "Corpse - Colony Division Manager" - assignment = "Colonial Division Manager" - rank = JOB_DIVISION_MANAGER - faction_group = FACTION_LIST_WY - paygrades = list(PAY_SHORT_WYC8 = JOB_PLAYTIME_TIER_0) - access = list( - ACCESS_WY_GENERAL, - ACCESS_WY_COLONIAL, - ACCESS_WY_MEDICAL, - ACCESS_WY_SECURITY, - ACCESS_WY_ENGINEERING, - ACCESS_WY_FLIGHT, - ACCESS_WY_RESEARCH, - ACCESS_WY_EXEC, - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) - -/datum/equipment_preset/corpse/manager/load_gear(mob/living/carbon/human/new_human) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/ivy(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/bulletproof(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES) - -//*****************************************************************************************************/ - -/datum/equipment_preset/corpse/administrator - name = "Corpse - Colony Administrator" - assignment = "Colonial Administrator" - rank = JOB_DIRECTOR - faction_group = FACTION_LIST_WY - paygrades = list(PAY_SHORT_WYC10 = JOB_PLAYTIME_TIER_0) - idtype = /obj/item/card/id/silver/cl - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ACCESS_WY_GENERAL, - ACCESS_WY_COLONIAL, - ACCESS_WY_MEDICAL, - ACCESS_WY_SECURITY, - ACCESS_WY_ENGINEERING, - ACCESS_WY_FLIGHT, - ACCESS_WY_RESEARCH, - ACCESS_WY_EXEC, - ACCESS_WY_PMC, - ACCESS_WY_PMC_TL, - ACCESS_WY_ARMORY, - ACCESS_WY_SECRETS, - ACCESS_WY_LEADERSHIP, - ACCESS_WY_SENIOR_LEAD, - ) - -/datum/equipment_preset/corpse/administrator/load_gear(mob/living/carbon/human/new_human) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/ivy(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/bulletproof(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo/executive(new_human), WEAR_R_STORE) - add_random_cl_survivor_loot(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/purple(new_human), WEAR_ACCESSORY) + if(5) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/red(new_human), WEAR_ACCESSORY) + //jacket + var/random_researcher_suit = rand(1,5) + switch(random_researcher_suit) + if(1 to 2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(new_human), WEAR_JACKET) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/vest/tan(new_human), WEAR_JACKET) + if(4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/vest(new_human), WEAR_JACKET) + if(5) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/vest/grey(new_human), WEAR_JACKET) + //limb + add_dress_shoes(new_human) -/datum/equipment_preset/corpse/administrator/burst - name = "Corpse - Burst Colony Administrator" +/datum/equipment_preset/corpse/researcher/burst + name = "Corpse - Researcher (Burst)" xenovictim = TRUE -//*****************************************************************************************************/ +/datum/equipment_preset/corpse/doctor + name = "Corpse - Doctor" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + assignment = "Medical Doctor" + paygrades = list(PAY_SHORT_CDOC = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian/survivor/doctor + access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_MEDBAY) -/datum/equipment_preset/corpse/wysec - name = "Corpse - Weyland-Yutani Corporate Security Guard" - idtype = /obj/item/card/id/pmc - assignment = "Weyland-Yutani Corporate Security Guard" - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ACCESS_WY_SECURITY, - ACCESS_WY_COLONIAL, - ACCESS_WY_GENERAL, - ) +/datum/equipment_preset/corpse/doctor/load_gear(mob/living/carbon/human/new_human) -/datum/equipment_preset/corpse/wysec/load_gear(mob/living/carbon/human/new_human) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/white_service(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.undershirt = "undershirt" + //back + add_random_satchel(new_human) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //uniform + add_professionalwear(new_human) + add_tie(new_human) + //jacket + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(new_human), WEAR_JACKET) + //limb + add_dress_shoes(new_human) -//*****************************************************************************************************/ +/datum/equipment_preset/corpse/doctor/burst + name = "Corpse - Doctor (Burst)" + xenovictim = TRUE -//Colonists +/datum/equipment_preset/corpse/doctor/scrubs + name = "Corpse - Doctor, Scrubs" -/datum/equipment_preset/corpse/colonist - name = "Corpse - Colonist" +/datum/equipment_preset/corpse/doctor/scrubs/load_gear(mob/living/carbon/human/new_human) -/datum/equipment_preset/colonist/load_gear(mob/living/carbon/human/new_human) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) + new_human.undershirt = "undershirt" + //back + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/blue(new_human), WEAR_BACK) + //uniform + var/random_scrubs= rand(1,4) + switch(random_scrubs) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/green(new_human), WEAR_BODY) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/blue(new_human), WEAR_BODY) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(new_human), WEAR_BODY) + if(4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/lightblue(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/stethoscope(new_human), WEAR_ACCESSORY) + //limb + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) -/datum/equipment_preset/corpse/colonist/burst - name = "Corpse - Burst Colonist" +/datum/equipment_preset/corpse/doctor/scrubs/burst + name = "Corpse - Doctor, Scrubs (Burst)" xenovictim = TRUE -//*****************************************************************************************************/ - -/datum/equipment_preset/corpse/colonist/random - name = "Corpse - Colonist Random" +/datum/equipment_preset/corpse/prisoner + name = "Corpse - Prisoner" + faction = FACTION_COLONIST + assignment = "Inmate" + access = list(null) + idtype = /obj/item/card/id -/datum/equipment_preset/corpse/colonist/random/load_gear(mob/living/carbon/human/new_human) - var/random_surv_type = pick(SSmapping.configs[GROUND_MAP].survivor_types) - var/datum/equipment_preset/survivor/surv_equipment = new random_surv_type - surv_equipment.load_gear(new_human) +/datum/equipment_preset/corpse/prisoner/load_gear(mob/living/carbon/human/new_human) + new_human.undershirt = "undershirt" + //uniform + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/prison_boiler(new_human), WEAR_BODY) + //limb + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) -/datum/equipment_preset/corpse/colonist/random/burst - name = "Corpse - Burst Colonist Random" +/datum/equipment_preset/corpse/prisoner/burst + name = "Corpse - Prisoner (Burst)" xenovictim = TRUE -//*****************************************************************************************************/ - -/datum/equipment_preset/corpse/colonist/kutjevo - name = "Corpse - Colonist Kutjevo" +/datum/equipment_preset/corpse/guard + name = "Corpse - Security Guard, Prison" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + assignment = "Corrections Officer" + paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian/survivor/marshal + access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND) -/datum/equipment_preset/corpse/colonist/kutjevo/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/corpse/guard/load_gear(mob/living/carbon/human/new_human) - add_random_kutjevo_survivor_uniform(new_human) - add_random_kutjevo_survivor_equipment(new_human) - add_random_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) + new_human.undershirt = "undershirt" + //back + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //head + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/corrections, WEAR_HEAD) + //uniform + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/boilersuit/darkblue, WEAR_BODY) + //jacket + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/ballistic, WEAR_JACKET) + //waist + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/colonist, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol, WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol, WEAR_IN_BELT) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) + //pockets + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/alt, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3, WEAR_IN_R_STORE) -/datum/equipment_preset/corpse/colonist/kutjevo/burst - name = "Corpse - Burst Colonist Kutjevo" +/datum/equipment_preset/corpse/guard/burst + name = "Corpse - Security Guard, Prison (Burst)" xenovictim = TRUE -//*****************************************************************************************************/ - -//UA Riot Control Officer - -/datum/equipment_preset/corpse/ua_riot - name = "Corpse - UA Officer" - assignment = "United Americas Riot Officer" - idtype = /obj/item/card/id/silver - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) +/datum/equipment_preset/corpse/riot + name = "Corpse - Security Guard, UA Colonial Guard" + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_COLONIST + assignment = "Colonial Militiaman" + paygrades = list(PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian/survivor/marshal + access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND) + idtype = /obj/item/card/id/dogtag -/datum/equipment_preset/corpse/ua_riot/load_gear(mob/living/carbon/human/new_human) - var/random = rand(1,5) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/ua_riot(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/weapon/classic_baton(new_human), WEAR_WAIST) +/datum/equipment_preset/corpse/riot/load_gear(mob/living/carbon/human/new_human) - switch(random) + new_human.undershirt = "undershirt" + //back + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel, WEAR_BACK) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //head + var/maybecap = rand(1,3) + switch(maybecap) if(1) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield, WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/khaki, WEAR_IN_BACK) if(2) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/khaki, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield, WEAR_IN_BACK) if(3) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/aviator(new_human), WEAR_EYES) - if(4) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) - if(5) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(new_human), WEAR_IN_BACK) - + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/khaki, WEAR_IN_BACK) + //uniform + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/boilersuit/khaki, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/ranks/marine/e2, WEAR_ACCESSORY) + //jacket + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/ballistic, WEAR_JACKET) + //waist + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/colonist, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol, WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol, WEAR_IN_BELT) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) + add_worker_gloves(new_human) + //pockets + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/alt, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3, WEAR_IN_R_STORE) -/datum/equipment_preset/corpse/ua_riot/burst - name = "Corpse - Burst UA Officer" +/datum/equipment_preset/corpse/riot/burst + name = "Corpse - Security Guard, UA Colonial Guard (Burst)" xenovictim = TRUE -//*****************************************************************************************************/ - -//Colonial Supervisor - -/datum/equipment_preset/corpse/wy - flags = EQUIPMENT_PRESET_STUB - -/datum/equipment_preset/corpse/wy/manager - name = "Corpse - Corporate Supervisor" - assignment = "Colony Supervisor" +/datum/equipment_preset/corpse/security + name = "Corpse - Security Guard, Wey-Yu" flags = EQUIPMENT_PRESET_EXTRA - paygrades = list(PAY_SHORT_WYC6 = JOB_PLAYTIME_TIER_0) - rank = FACTION_WY - idtype = /obj/item/card/id/silver/clearance_badge/manager - faction_group = FACTION_LIST_WY - access = list( - ACCESS_WY_GENERAL, - ACCESS_WY_COLONIAL, - ACCESS_WY_LEADERSHIP, - ACCESS_WY_SECURITY, - ACCESS_WY_EXEC, - ACCESS_WY_RESEARCH, - ACCESS_WY_ENGINEERING, - ACCESS_WY_MEDICAL, - ACCESS_ILLEGAL_PIRATE, - ) - -/datum/equipment_preset/corpse/wy/manager/load_gear(mob/living/carbon/human/new_human) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/manager(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/manager(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/manager(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) - add_random_cl_survivor_loot(new_human) - -/datum/equipment_preset/corpse/wy/manager/burst - name = "Corpse - Burst Corporate Supervisor" - xenovictim = TRUE - -//*****************************************************************************************************/ - -//Faction Specific Corpses - -//CLF - -/datum/equipment_preset/corpse/clf - name = "Corpse - Colonial Liberation Front Soldier" - assignment = JOB_CLF - idtype = /obj/item/card/id/data - rank = JOB_CLF - faction = FACTION_CLF - -/datum/equipment_preset/corpse/clf/New() - . = ..() - access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) + get_access(ACCESS_LIST_COLONIAL_ALL) + faction = FACTION_COLONIST + assignment = "Weyland-Yutani Corporate Security Officer" + paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian/survivor/marshal + access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_SECURITY) -/datum/equipment_preset/corpse/clf/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/colonist/corpse/security/load_gear(mob/living/carbon/human/new_human) - spawn_rebel_uniform(new_human) - spawn_rebel_suit(new_human) - spawn_rebel_helmet(new_human) - spawn_rebel_shoes(new_human) - spawn_rebel_gloves(new_human) - spawn_rebel_belt(new_human) + new_human.undershirt = "undershirt" + //back + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + //uniform + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/blue(new_human), WEAR_ACCESSORY) + //jacket + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest, WEAR_JACKET) + //waist + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/colonist, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, WEAR_IN_BELT) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) + //pockets + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/alt, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) - add_random_survivor_equipment(new_human) - add_pmc_survivor_weapon(new_human) - add_survivor_weapon_pistol(new_human) +/datum/equipment_preset/corpse/security/burst + name = "Corpse - Security Guard, Wey-Yu (Burst)" + xenovictim = TRUE -/datum/equipment_preset/corpse/clf/burst - name = "Corpse - Burst Colonial Liberation Front Soldier" +/datum/equipment_preset/corpse/cmb + name = "Corpse - Colonial Marshals Deputy" + paygrades = list(PAY_SHORT_CMBD = JOB_PLAYTIME_TIER_0) + role_comm_title = "CMB DEP" + flags = EQUIPMENT_PRESET_EXTRA + assignment = "Office of Colonial Marshals Deputy" + rank = JOB_CMB + skills = /datum/skills/cmb + +/datum/equipment_preset/corpse/cmb/load_gear(mob/living/carbon/human/new_human) + + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/spearhead, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/full/revolver, WEAR_WAIST) + +/datum/equipment_preset/corpse/cmb/burst + name = "Corpse - Colonial Marshals Deputy (Burst)" xenovictim = TRUE //*****************************************************************************************************/ @@ -703,7 +508,7 @@ new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_JACKET) //limbs - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp_knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) //pockets new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine, WEAR_R_STORE) @@ -711,107 +516,68 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid, WEAR_L_STORE) /datum/equipment_preset/corpse/upp/burst - name = "Corpse - Burst UPP Squad Rifleman" + name = "Corpse - UPP Squad Rifleman (Burst)" xenovictim = TRUE -//*****************************************************************************************************/ - -//PMC - -/datum/equipment_preset/corpse/pmc - name = "Corpse - Weyland-Yutani PMC (Standard)" - flags = EQUIPMENT_PRESET_START_OF_ROUND - assignment = JOB_PMC_STANDARD - faction = FACTION_PMC - faction_group = FACTION_LIST_WY - rank = JOB_PMC_STANDARD - paygrades = list(PAY_SHORT_PMC_OP = JOB_PLAYTIME_TIER_0) - idtype = /obj/item/card/id/pmc - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ACCESS_WY_GENERAL, - ACCESS_WY_COLONIAL, - ACCESS_WY_SECURITY, - ACCESS_WY_PMC, - ) - -/datum/equipment_preset/corpse/pmc/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/hvh, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf, WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp70, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_L_STORE) - add_random_survivor_equipment(new_human) - -/datum/equipment_preset/corpse/pmc/burst - name = "Corpse - Burst Weyland-Yutani PMC (Standard)" +/datum/equipment_preset/corpse/royal_marine + name = "Corpse - TWE Squad Rifleman" + paygrades = list(PAY_SHORT_RMC1 = JOB_PLAYTIME_TIER_0) + role_comm_title = "RMC" + flags = EQUIPMENT_PRESET_EXTRA + assignment = "Royal Marines Rifleman" + rank = JOB_TWE_RMC_RIFLEMAN + skills = /datum/skills/rmc + +/datum/equipment_preset/corpse/royal_marine/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/royal_marine, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/royal_marine, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/royal_marine, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/rmc, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/royal_marines, WEAR_ACCESSORY) + + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/royal_marine, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_IN_ACCESSORY) + + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/royal_marine/light, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/rmc_f90, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/rmc/rmc_f90_ammo, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/light, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) + +/datum/equipment_preset/corpse/royal_marine/burst + name = "Corpse - TWE Squad Rifleman (Burst)" xenovictim = TRUE -//*****************************************************************************************************/ - -//Goon - -/datum/equipment_preset/corpse/pmc/goon - name = "Corpse - Weyland-Yutani Corporate (Goon)" - languages = list(LANGUAGE_ENGLISH) - assignment = JOB_WY_GOON - rank = JOB_WY_GOON - paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) - -/datum/equipment_preset/corpse/pmc/goon/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian, WEAR_FEET) - - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp70_near_empty, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) - -//*****************************************************************************************************/ - -//Lead Goon - -/datum/equipment_preset/corpse/pmc/goon/lead - name = "Corpse - Weyland-Yutani Corporate Security Lead (Goon Lead)" +/datum/equipment_preset/corpse/uscm + name = "Corpse - USCM Squad Rifleman" flags = EQUIPMENT_PRESET_EXTRA - assignment = JOB_WY_GOON_LEAD - rank = JOB_WY_GOON_LEAD - paygrades = list(PAY_SHORT_CSPO = JOB_PLAYTIME_TIER_0) - -/datum/equipment_preset/corpse/pmc/goon/lead/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate/lead, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/lead, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian, WEAR_FEET) + access = list(ACCESS_MARINE_PREP) + assignment = JOB_SQUAD_MARINE + rank = JOB_SQUAD_MARINE + paygrades = list(PAY_SHORT_ME1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_3) + role_comm_title = "RFN" + skills = /datum/skills/pfc + minimap_icon = "private" - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp70_near_empty, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) +/datum/equipment_preset/corpse/uscm/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41amk1(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1(new_human.back), WEAR_IN_BACK) -/datum/equipment_preset/corpse/pmc/goon/lead/burst - name = "Corpse - Burst Weyland-Yutani Corporate Security Lead (Goon Lead)" +/datum/equipment_preset/corpse/uscm/burst + name = "Corpse - USCM Squad Rifleman (Burst)" xenovictim = TRUE //*****************************************************************************************************/ @@ -843,189 +609,7 @@ spawn_merc_helmet(new_human) /datum/equipment_preset/corpse/freelancer/burst - name = "Corpse - Burst Freelancer" - xenovictim = TRUE - -//*****************************************************************************************************/ - -//Fun Faction Corpses - -//Pirates - -/datum/equipment_preset/corpse/realpirate - name = "Corpse - Pirate" - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ACCESS_ILLEGAL_PIRATE, - ) - -/datum/equipment_preset/corpse/realpirate/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/pirate(new_human), WEAR_BODY) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(new_human), WEAR_HEAD) - -//*****************************************************************************************************/ - -/datum/equipment_preset/corpse/realpirate/ranged - name = "Corpse - Pirate Gunner" - -/datum/equipment_preset/corpse/realpirate/ranged/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/pirate(new_human), WEAR_HEAD) - . = ..() - -//*****************************************************************************************************/ - -//Russian(?) - -/datum/equipment_preset/corpse/russian - name = "Corpse - Russian" - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) - -/datum/equipment_preset/corpse/russian - -/datum/equipment_preset/corpse/russian/load_gear(mob/living/carbon/human/new_human) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/veteran/soviet_uniform_01(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/soviet(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) - if(prob(25)) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/bearpelt(new_human), WEAR_HEAD) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - -//*****************************************************************************************************/ - -//Dutch Dozen - -/datum/equipment_preset/corpse/dutchrifle - name = "Corpse - Dutch Dozen Rifleman" - assignment = "Dutch Dozen Rifleman" - idtype = /obj/item/card/id/silver - faction = FACTION_DUTCH - xenovictim = FALSE - -/datum/equipment_preset/corpse/dutchrifle/New() - . = ..() - access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) + get_access(ACCESS_LIST_COLONIAL_ALL) - -/datum/equipment_preset/corpse/dutchrifle/load_gear(mob/living/carbon/human/new_human) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/dutch(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/dutch(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/dutch(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle/knife(new_human), WEAR_FEET) - spawn_merc_helmet(new_human) - -/datum/equipment_preset/corpse/dutchrifle/burst - name = "Corpse - Burst Dutch Dozen Rifleman" - xenovictim = TRUE - -//*****************************************************************************************************/ - -//Pizza Planet - -/datum/equipment_preset/corpse/pizza - name = "Corpse - Pizza Deliverer" - assignment = "Pizza Deliverer" - idtype = /obj/item/card/id/silver - faction = FACTION_PIZZA - xenovictim = FALSE - -/datum/equipment_preset/corpse/pizza/New() - . = ..() - access = get_access(ACCESS_LIST_DELIVERY) - -/datum/equipment_preset/corpse/pizza/load_gear(mob/living/carbon/human/new_human) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/pizza, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/red, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/red, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/pizzabox/margherita, WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/cans/dr_gibb, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/holdout, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/pizzabox/vegetable, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/pizzabox/mushroom, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/pizzabox/meat, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/cans/dr_gibb, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/cans/thirteenloko, WEAR_IN_BACK) - -/datum/equipment_preset/corpse/pizza/burst - name = "Corpse - Burst Pizza Deliverer" - xenovictim = TRUE - -//*****************************************************************************************************/ - -//Gladiator - -/datum/equipment_preset/corpse/gladiator - name = "Corpse - Gladiator" - assignment = "Gladiator" - idtype = /obj/item/card/id/dogtag - faction = FACTION_GLADIATOR - xenovictim = FALSE - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ACCESS_MARINE_MAINT, - ) - -/datum/equipment_preset/corpse/gladiator/load_gear(mob/living/carbon/human/new_human) - - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/chainshirt/hunter, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/gladiator, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_R_HAND) - new_human.equip_to_slot_or_del(new /obj/item/weapon/sword, WEAR_L_HAND) - - var/obj/item/lantern = new /obj/item/device/flashlight/lantern(new_human) - lantern.name = "Beacon of Holy Light" - -/datum/equipment_preset/corpse/gladiator/burst - name = "Corpse - Burst Gladiator" + name = "Corpse - Freelancer (Burst)" xenovictim = TRUE //*****************************************************************************************************/ diff --git a/code/modules/gear_presets/survivors/corsat/preset_corsat.dm b/code/modules/gear_presets/survivors/corsat/preset_corsat.dm deleted file mode 100644 index 9583c73a92e..00000000000 --- a/code/modules/gear_presets/survivors/corsat/preset_corsat.dm +++ /dev/null @@ -1,58 +0,0 @@ -/datum/equipment_preset/survivor/security/corsat - name = "Survivor - CORSAT Security Guard" - assignment = "Weyland-Yutani Security Guard" - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) - -/datum/equipment_preset/survivor/security/corsat/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/white_service(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/doctor/corsat - name = "Survivor - CORSAT Doctor" - assignment = "CORSAT Doctor" - -/datum/equipment_preset/survivor/doctor/corsat/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/green(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/green(new_human), WEAR_HEAD) - ..() - -/datum/equipment_preset/survivor/scientist/corsat - name = "Survivor - CORSAT Researcher" - assignment = "CORSAT Researcher" - -/datum/equipment_preset/survivor/scientist/corsat/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/researcher(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison/corsat - name = "Survivor - Interstellar Commerce Commission Liaison CORSAT" - assignment = "Interstellar Commerce Commission Corporate Liaison" - -/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison/corsat/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/corporate_formal(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET) - ..() - -/datum/equipment_preset/survivor/engineer/corsat - name = "Survivor - Corsat Station Engineer" - assignment = "Corsat Station Engineer" - -/datum/equipment_preset/survivor/engineer/corsat/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/engi(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/techofficer(new_human), WEAR_HEAD) - ..() diff --git a/code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm b/code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm deleted file mode 100644 index 873ade0aefc..00000000000 --- a/code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm +++ /dev/null @@ -1,66 +0,0 @@ - -/datum/equipment_preset/survivor/scientist/fiorina - name = "Survivor - Fiorina Researcher" - assignment = "Fiorina Researcher" - -/datum/equipment_preset/survivor/scientist/fiorina/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/pink(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/leader(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/researcher(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/tox(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - ..() - - -/datum/equipment_preset/survivor/doctor/fiorina - name = "Survivor - Fiorina Doctor" - assignment = "Fiorina Doctor" - -/datum/equipment_preset/survivor/doctor/fiorina/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/lightblue(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD) - ..() - -/datum/equipment_preset/survivor/security/fiorina - name = "Survivor - Fiorina Prison Guard" - assignment = "Fiorina Prison Guard" - -/datum/equipment_preset/survivor/security/fiorina/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge(new_human), WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/sec/corp(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/colonial_marshal/fiorina - name = "Survivor - United Americas Riot Officer" - assignment = "United Americas Riot Officer" - -/datum/equipment_preset/survivor/colonial_marshal/fiorina/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/ua_riot(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - - ..() - -/datum/equipment_preset/survivor/engineer/fiorina - name = "Survivor - Fiorina Engineer" - assignment = "Fiorina Engineer" - -/datum/equipment_preset/survivor/engineer/fiorina/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/khaki(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/orange(new_human), WEAR_HEAD) - ..() diff --git a/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm b/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm deleted file mode 100644 index 17f996e8e3d..00000000000 --- a/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm +++ /dev/null @@ -1,279 +0,0 @@ -// loadouts for riot_in_progress.dmm nightmare, thematic survivor preset. - -/datum/equipment_preset/survivor/cmb - name = "Survivor - Colonial Marshal" - faction = FACTION_MARSHAL - faction_group = list(FACTION_MARSHAL, FACTION_MARINE, FACTION_SURVIVOR) - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) - var/human_versus_human = FALSE - access = list( - ACCESS_LIST_UA, - ) - -//*************************************************CMB****************************************************/ - -/datum/equipment_preset/survivor/cmb/standard - name = "Survivor - Colonial Marshal Deputy(Riot Response)" - paygrades = list(PAY_SHORT_CMBD = JOB_PLAYTIME_TIER_0) - role_comm_title = "CMB DEP" - flags = EQUIPMENT_PRESET_EXTRA - assignment = "CMB Deputy" - rank = JOB_CMB - skills = /datum/skills/cmb - -/datum/equipment_preset/survivor/cmb/standard/load_gear(mob/living/carbon/human/new_human) - - var/choice = rand(1,10) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette, WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/holdout, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15/rubber, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/full, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/holdout, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/camera, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK) - - switch(choice) - if(1 to 6) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/spearhead, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) - if(7 to 8) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge/rubber, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) - if(9 to 10) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/spearhead, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) - -// cmb synth (of note /datum/equipment_preset/synth/survivor/cmb_synth also exists) -/datum/equipment_preset/synth/survivor/cmb - flags = EQUIPMENT_PRESET_STUB - -/datum/equipment_preset/synth/survivor/cmb/synth - name = "Survivor - Synthetic - CMB Investigative Synthetic(Riot Response)" - paygrades = list(PAY_SHORT_CMBS = JOB_PLAYTIME_TIER_0) - idtype = /obj/item/card/id/deputy - role_comm_title = "CMB Syn" - flags = EQUIPMENT_PRESET_EXTRA - assignment = "CMB Investigative Synthetic" - rank = JOB_CMB_SYN - languages = ALL_SYNTH_LANGUAGES - skills = /datum/skills/synthetic/cmb - -/datum/equipment_preset/synth/survivor/cmb/synth/load_race(mob/living/carbon/human/new_human) - new_human.set_species(SYNTH_COLONY) - -/datum/equipment_preset/synth/survivor/cmb/synth/load_gear(mob/living/carbon/human/new_human) - //backpack - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/security, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/autopsy_scanner, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge/rubber, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/camera, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK) - //face - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/pen, WEAR_R_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB, WEAR_HEAD) - //uniform - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/upgraded, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/candy, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/imidazoline, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) - //belt - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/synth, WEAR_WAIST) - //holding - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - //pouches - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/synth/full, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver/tactical, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/wirecutters/tactical, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/wrench, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_R_STORE) - -//************************************************UA RIOT POLICE****************************************************/ - -/datum/equipment_preset/survivor/cmb/ua - name = "Survivor - United Americas Riot Officer(Riot Response)" - paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) - role_comm_title = "UA RCP" - flags = EQUIPMENT_PRESET_EXTRA - assignment = "United Americas Police Officer" - skills = /datum/skills/civilian/survivor/marshal - idtype = /obj/item/card/id/silver - -/datum/equipment_preset/survivor/cmb/ua/load_gear(mob/living/carbon/human/new_human) - - var/choice = rand(1,10) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/ua_riot, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield, WEAR_IN_HELMET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full, WEAR_L_STORE) - - switch(choice) - if(1 to 6) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/b92fs, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/b92fs, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/b92fs, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m16, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/weapon/classic_baton, WEAR_R_HAND) - if(7) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat/riot, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/weapon/classic_baton, WEAR_R_HAND) - new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_L_HAND) - if(8) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/rubber, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/launcher/grenade/m81/riot, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/slug/baton, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/slug/baton, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/slug/baton, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/slug/baton, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_R_STORE) - if(9 to 10) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower/black, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge/rubber, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) - -// ua synth -/datum/equipment_preset/synth/survivor/cmb/ua_synth - name = "Survivor - Synthetic - UA Police Synthetic(Riot Response)" - paygrades = list(PAY_SHORT_CMBS = JOB_PLAYTIME_TIER_0) - role_comm_title = "UA Syn" - flags = EQUIPMENT_PRESET_EXTRA - assignment = "UA Police Synthetic" - languages = ALL_SYNTH_LANGUAGES - skills = /datum/skills/colonial_synthetic - idtype = /obj/item/card/id/silver - -/datum/equipment_preset/synth/survivor/cmb/ua_synth/load_race(mob/living/carbon/human/new_human) - new_human.set_species(SYNTH_COLONY) - -/datum/equipment_preset/synth/survivor/cmb/ua_synth/load_gear(mob/living/carbon/human/new_human) - //backpack - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/baton_slug, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, WEAR_IN_BACK) - //face - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/pen, WEAR_R_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield, WEAR_IN_HELMET) - //uniform - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/storage/box/flashbangs, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/ua_riot/synth, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang, WEAR_IN_JACKET) - //belt - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full/synth, WEAR_WAIST) - //holding - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/classic_baton, WEAR_R_HAND) - new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_L_HAND) - //pouches - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/synth/full, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full, WEAR_R_STORE) diff --git a/code/modules/gear_presets/survivors/kutjevo/preset_kutjevo.dm b/code/modules/gear_presets/survivors/kutjevo/preset_kutjevo.dm deleted file mode 100644 index 1800e131c53..00000000000 --- a/code/modules/gear_presets/survivors/kutjevo/preset_kutjevo.dm +++ /dev/null @@ -1,75 +0,0 @@ -/datum/equipment_preset/survivor/engineer/kutjevo - name = "Survivor - Kutjevo Engineer" - assignment = "Kutjevo Engineer" - -/datum/equipment_preset/survivor/engineer/kutjevo/load_gear(mob/living/carbon/human/new_human) - add_random_kutjevo_survivor_uniform(new_human) - add_random_kutjevo_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/black(new_human), WEAR_JACKET) - ..() - -/datum/equipment_preset/survivor/chaplain/kutjevo - name = "Survivor - Kutjevo Chaplain" - assignment = "Kutjevo Chaplain" - -/datum/equipment_preset/survivor/chaplain/kutjevo/load_gear(mob/living/carbon/human/new_human) - add_random_kutjevo_survivor_uniform(new_human) - add_random_kutjevo_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) - - ..() - -/datum/equipment_preset/survivor/security/kutjevo - name = "Survivor - Kutjevo Security Guard" - assignment = "Kutjevo Security Guard" - - -/datum/equipment_preset/survivor/security/kutjevo/load_gear(mob/living/carbon/human/new_human) - add_random_kutjevo_survivor_uniform(new_human) - add_random_kutjevo_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/doctor/kutjevo - name = "Survivor - Kutjevo Doctor" - assignment = "Kutjevo Doctor" - -/datum/equipment_preset/survivor/doctor/kutjevo/load_gear(mob/living/carbon/human/new_human) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) - add_random_kutjevo_survivor_uniform(new_human) - add_random_kutjevo_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) - ..() - -/datum/equipment_preset/survivor/colonial_marshal/kutjevo - name = "Survivor - Kutjevo Colonial Marshal Deputy" - assignment = "CMB Deputy" - -/datum/equipment_preset/survivor/colonial_marshal/kutjevo/load_gear(mob/living/carbon/human/new_human) - add_random_kutjevo_survivor_uniform(new_human) - add_random_kutjevo_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) - ..() - -/datum/equipment_preset/survivor/trucker/kutjevo - name = "Survivor - Kutjevo Heavy Vehicle Operator" - assignment = "Kutjevo Heavy Vehicle Operator" - -/datum/equipment_preset/survivor/trucker/kutjevo/load_gear(mob/living/carbon/human/new_human) - add_random_kutjevo_survivor_uniform(new_human) - add_random_kutjevo_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - ..() diff --git a/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm b/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm index edcd602cd16..2a7c328106e 100644 --- a/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm +++ b/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm @@ -44,9 +44,6 @@ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/sof/survivor_forecon(new_human), WEAR_L_EAR) GLOB.character_traits[/datum/character_trait/skills/spotter].apply_trait(new_human) -/datum/equipment_preset/survivor/forecon/add_survivor_weapon_security(mob/living/carbon/human/new_human) - return - /datum/equipment_preset/survivor/forecon/proc/add_forecon_weapon(mob/living/carbon/human/new_human) var/random_gun = rand(1,3) switch(random_gun) diff --git a/code/modules/gear_presets/survivors/lv_624/clfship_insert_lv624.dm b/code/modules/gear_presets/survivors/lv_624/clfship_insert_lv624.dm deleted file mode 100644 index 1bfeaaad9c4..00000000000 --- a/code/modules/gear_presets/survivors/lv_624/clfship_insert_lv624.dm +++ /dev/null @@ -1,30 +0,0 @@ -// /obj/effect/landmark/survivor_spawner/lv624_crashed_clf -// clfship.dmm -/datum/equipment_preset/survivor/clf - name = "CLF Survivor" - flags = EQUIPMENT_PRESET_EXTRA - skills = /datum/skills/civilian/survivor/clf - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) - faction = FACTION_CLF - faction_group = list(FACTION_CLF, FACTION_SURVIVOR) - access = list(ACCESS_CIVILIAN_PUBLIC) - survivor_variant = HOSTILE_SURVIVOR - -/datum/equipment_preset/survivor/clf/load_gear(mob/living/carbon/human/new_human) - - spawn_rebel_uniform(new_human) - spawn_rebel_suit(new_human) - spawn_rebel_helmet(new_human) - spawn_rebel_shoes(new_human) - spawn_rebel_gloves(new_human) - spawn_rebel_belt(new_human) - - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) - add_survivor_weapon_security(new_human) - add_survivor_weapon_pistol(new_human) - - ..() diff --git a/code/modules/gear_presets/survivors/lv_624/corporate_dome_insert_lv624.dm b/code/modules/gear_presets/survivors/lv_624/corporate_dome_insert_lv624.dm deleted file mode 100644 index af00c81443d..00000000000 --- a/code/modules/gear_presets/survivors/lv_624/corporate_dome_insert_lv624.dm +++ /dev/null @@ -1,50 +0,0 @@ -// /obj/effect/landmark/survivor_spawner/lv624_corporate_dome/cl -// corporatedomehold.dmm - -/datum/equipment_preset/survivor/wy/executive - name = "Survivor - LV-624 Paranoid Corporate Liaison" - flags = EQUIPMENT_PRESET_START_OF_ROUND - paygrades = list(PAY_SHORT_WYC5 = JOB_PLAYTIME_TIER_0) - skills = /datum/skills/civilian/survivor/manager - assignment = "LV-624 Corporate Liaison" - idtype = /obj/item/card/id/silver/clearance_badge/cl - faction_group = list(FACTION_WY, FACTION_SURVIVOR) - access = list( - ACCESS_WY_GENERAL, - ACCESS_WY_COLONIAL, - ACCESS_WY_MEDICAL, - ACCESS_WY_SECURITY, - ACCESS_WY_RESEARCH, - ACCESS_WY_ARMORY, - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_RUSSIAN) - - survivor_variant = CORPORATE_SURVIVOR - -/datum/equipment_preset/survivor/wy/executive/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/field(new_human), WEAR_BODY) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/secure/briefcase(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/med_small_stack(new_human), WEAR_IN_BACK) - add_random_cl_survivor_loot(new_human) - add_random_cl_survivor_loot(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE) diff --git a/code/modules/gear_presets/survivors/lv_624/preset_lv.dm b/code/modules/gear_presets/survivors/lv_624/preset_lv.dm deleted file mode 100644 index 58c756cbd02..00000000000 --- a/code/modules/gear_presets/survivors/lv_624/preset_lv.dm +++ /dev/null @@ -1,104 +0,0 @@ -/datum/equipment_preset/survivor/scientist/lv - name = "Survivor - LV-624 Archeologist" - assignment = "LV-624 Archeologist" - -/datum/equipment_preset/survivor/scientist/lv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/blue(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/utility_vest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie/tan(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/tool/shovel/spade(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/aviator(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup/brown(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/colonial_marshal/lv - name = "Survivor - LV-624 Colonial Marshal Deputy" - assignment = "CMB Deputy" - -/datum/equipment_preset/survivor/colonial_marshal/lv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/trucker/lv - name = "Survivor - LV-624 Cargo Technician" - assignment = "LV-624 Cargo Technician" - -/datum/equipment_preset/survivor/trucker/lv/load_gear(mob/living/carbon/human/new_human) - var/obj/item/clothing/under/colonist/workwear/khaki/uniform = new() - uniform.roll_suit_jacket(new_human) - new_human.equip_to_slot_or_del(uniform, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/meson(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/yellow(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - ..() - -/datum/equipment_preset/survivor/engineer/lv - name = "Survivor - LV-624 Engineer" - assignment = "LV-624 Engineer" - -/datum/equipment_preset/survivor/engineer/lv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/dispatch(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/orange(new_human), WEAR_HEAD) - ..() - -/datum/equipment_preset/survivor/chaplain/lv - name = "Survivor - LV-624 Priest" - assignment = "LV-624 Priest" - -/datum/equipment_preset/survivor/chaplain/lv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/priest_robe(new_human), WEAR_JACKET) - ..() - -/datum/equipment_preset/survivor/doctor/lv - name = "Survivor - LV-624 Emergency Medical Technician" - assignment = "LV-624 Emergency Medical Technician" - -/datum/equipment_preset/survivor/doctor/lv/load_gear(mob/living/carbon/human/new_human) - var/obj/item/clothing/under/colonist/workwear/blue/uniform = new() - uniform.roll_suit_jacket(new_human) - new_human.equip_to_slot_or_del(uniform, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/stethoscope(new_human), WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/windbreaker_fr(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/blue(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/roller(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human.back), WEAR_IN_BACK) - ..() - -/datum/equipment_preset/survivor/security/lv - name = "Survivor - LV-624 Security Guard" - assignment = "Weyland-Yutani Security Guard" - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) - -/datum/equipment_preset/survivor/security/lv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/white_service(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/corporate/lv - name = "Survivor - LV-624 Corporate Liaison" - assignment = "LV-624 Corporate Liaison" - -/datum/equipment_preset/survivor/corporate/lv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/field(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison(new_human), WEAR_BACK) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - ..() diff --git a/code/modules/gear_presets/survivors/misc.dm b/code/modules/gear_presets/survivors/misc.dm index 76c632b44c7..3225f20f599 100644 --- a/code/modules/gear_presets/survivors/misc.dm +++ b/code/modules/gear_presets/survivors/misc.dm @@ -1,211 +1,3 @@ - - -/* -Everything below isn't used or out of place. - -*/ - - -// ----- Prisoner Survivors -// Used in Fiorina Science Annex. -/datum/equipment_preset/survivor/prisoner - name = "Survivor - Prisoner" - assignment = "Prisoner" - skills = /datum/skills/civilian/survivor/prisoner - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC) - - survivor_variant = SECURITY_SURVIVOR - -/datum/equipment_preset/survivor/prisoner/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - if(prob(50)) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/riot(new_human), WEAR_HEAD) - if(prob(50)) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human.back), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) - add_survivor_weapon_civilian(new_human) - add_ice_colony_survivor_equipment(new_human) - ..() - -// Used in Fiorina Science Annex. -/datum/equipment_preset/survivor/gangleader - name = "Survivor - Gang Leader" - assignment = "Gang Leader" - skills = /datum/skills/civilian/survivor/gangleader - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC) - -/datum/equipment_preset/survivor/gangleader/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(new_human), WEAR_BODY) - if(prob(50)) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/riot(new_human), WEAR_HEAD) - if(prob(50)) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human.back), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) - add_survivor_weapon_civilian(new_human) - add_ice_colony_survivor_equipment(new_human) - ..() - -// ----- Civilian Survivor - -// Used in LV-624, Solaris Ridge, Trijent Dam, Fiorina Science Annex and Kutjevo Refinery. -/datum/equipment_preset/survivor/civilian - name = "Survivor - Civilian" - assignment = "Civilian" - skills = /datum/skills/civilian/survivor - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC) - -/datum/equipment_preset/survivor/civilian/load_gear(mob/living/carbon/human/new_human) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - var/random_gear = rand(0, 4) - switch(random_gear) - if(0) // Normal Colonist - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) - if(1) // Janitor - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/janitor(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/vir(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/purple(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular/hipster(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/purple(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/galoshes(new_human), WEAR_FEET) - if(2) // Bar Tender - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/waiter(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/lawyer/bluejacket(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/bowlerhat(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/fake_mustache(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/beer_pack(new_human.back), WEAR_IN_BACK) - if(3) // Botanist - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/green(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/hyd(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup/brown(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/tool/hatchet(new_human.back), WEAR_IN_BACK) - if(4) // Ripley outfit from Aliens - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/gray_blu(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/webbing(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/stompers(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general(new_human), WEAR_R_STORE) - add_survivor_weapon_civilian(new_human) - - ..() - -// --- Salesman Survivor - -// after double check salesman isn't being used anywhere. -/datum/equipment_preset/survivor/salesman - name = "Survivor - Salesman" - assignment = "Salesman" - skills = /datum/skills/civilian/survivor - flags = EQUIPMENT_PRESET_START_OF_ROUND - idtype = /obj/item/card/id/data - access = list(ACCESS_CIVILIAN_PUBLIC) - -/datum/equipment_preset/survivor/salesman/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/brown(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/wcoat(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - add_random_cl_survivor_loot(new_human) - add_survivor_weapon_civilian(new_human) - add_ice_colony_survivor_equipment(new_human) - ..() - - -// ----- Roughneck Survivor - -// Used in Trijent Dam. -/datum/equipment_preset/survivor/roughneck - name = "Survivor - Roughneck" - assignment = "Roughneck" - skills = /datum/skills/civilian/survivor/pmc - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC) - -/datum/equipment_preset/survivor/roughneck/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/blue(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/black(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/centcom(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large(new_human), WEAR_R_STORE) - add_pmc_survivor_weapon(new_human) - add_ice_colony_survivor_equipment(new_human) - ..() - -// ----- Bum Survivor - -// Used in New Varadero. -/datum/equipment_preset/survivor/beachbum - name = "Survivor - Beach Bum" - assignment = "Beach Bum" - skills = /datum/skills/civilian/survivor/prisoner - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC) - -/datum/equipment_preset/survivor/beachbum/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/shorts/red(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/weed(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/brown(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/beer_pack(new_human.back), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/kitchen/knife/butcher(new_human.back), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/wypacket(new_human.back), WEAR_IN_BACK) - add_survivor_weapon_civilian(new_human) - add_ice_colony_survivor_equipment(new_human) - ..() - -// ----- WY Survivors - -// Used in LV-624. -/datum/equipment_preset/survivor/goon - name = "Survivor - Corporate Security Goon" - flags = EQUIPMENT_PRESET_START_OF_ROUND - assignment = JOB_WY_GOON - paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) - idtype = /obj/item/card/id/silver/cl - skills = /datum/skills/civilian/survivor/goon - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_COMMAND, ACCESS_CIVILIAN_BRIG, ACCESS_WY_COLONIAL) - - survivor_variant = SECURITY_SURVIVOR - -/datum/equipment_preset/survivor/goon/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian, WEAR_FEET) - - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp70_near_empty, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) - - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/corporate/no_lock, WEAR_J_STORE) - - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE) - - // ----- Mercenary Survivors // after double check pmc/miner isn't being used anywhere. diff --git a/code/modules/gear_presets/survivors/new_varadero/preset_new_varadero.dm b/code/modules/gear_presets/survivors/new_varadero/preset_new_varadero.dm deleted file mode 100644 index 7f0ef0072dd..00000000000 --- a/code/modules/gear_presets/survivors/new_varadero/preset_new_varadero.dm +++ /dev/null @@ -1,87 +0,0 @@ -/datum/equipment_preset/survivor/security/nv - name = "Survivor - New Varadero Security Guard" - assignment = "United Americas Peacekeeper" - -/datum/equipment_preset/survivor/security/nv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/ua_riot(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/doctor/nv - name = "Survivor - New Varadero Medical Technician" - assignment = "New Varadero Medical Technician" - -/datum/equipment_preset/survivor/doctor/nv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic/utility(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human.back), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap(new_human), WEAR_HEAD) - ..() - -/datum/equipment_preset/survivor/scientist/nv - name = "Survivor - New Varadero Researcher" - assignment = "New Varadero Researcher" - -/datum/equipment_preset/survivor/scientist/nv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/researcher(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/researcher(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/cm/tan(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/chem(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison/nv - name = "Survivor - Interstellar Commerce Commission Liaison New Varadero" - assignment = "Interstellar Commerce Commission Corporate Liaison" - -/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison/nv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/corporate_formal(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/black(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/clipboard, WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses, WEAR_EYES) - ..() - -/datum/equipment_preset/survivor/trucker/nv - name = "Survivor - New Varadero Cargo Technician" - assignment = "New Varadero Cargo Technician" - -/datum/equipment_preset/survivor/trucker/nv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/wy_davisone(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/meson(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beanie/tan(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/tech(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/brown(new_human), WEAR_HANDS) - ..() - -/datum/equipment_preset/survivor/engineer/nv - name = "Survivor - New Varadero Technician" - assignment = "New Varadero Engineer" - -/datum/equipment_preset/survivor/engineer/nv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/ua_civvies(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/blue(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/dblue(new_human), WEAR_HEAD) - ..() - -/datum/equipment_preset/survivor/chaplain/nv - name = "Survivor - New Varadero Priest" - assignment = "New Varadero Priest" - -/datum/equipment_preset/survivor/chaplain/nv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/priest_robe(new_human), WEAR_JACKET) - ..() diff --git a/code/modules/gear_presets/survivors/shivas_snowball/panic_room_insert_shivas.dm b/code/modules/gear_presets/survivors/shivas_snowball/panic_room_insert_shivas.dm deleted file mode 100644 index 16092ad5113..00000000000 --- a/code/modules/gear_presets/survivors/shivas_snowball/panic_room_insert_shivas.dm +++ /dev/null @@ -1,43 +0,0 @@ -// /obj/effect/landmark/survivor_spawner/shivas_assistant_manager -// panic_room_insert_shivas.dmm - -/datum/equipment_preset/survivor/wy/asstmanager - name = "Survivor - Corporate Assistant Manager" - flags = EQUIPMENT_PRESET_EXTRA - paygrades = list(PAY_SHORT_WYC7 = JOB_PLAYTIME_TIER_0) - skills = /datum/skills/civilian/survivor/manager - assignment = "Assistant Operations Manager" - idtype = /obj/item/card/id/silver/clearance_badge/manager - faction_group = list(FACTION_WY, FACTION_SURVIVOR) - access = list( - ACCESS_WY_GENERAL, - ACCESS_WY_COLONIAL, - ACCESS_WY_MEDICAL, - ACCESS_WY_SECURITY, - ACCESS_WY_RESEARCH, - ACCESS_WY_ARMORY, - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) - - survivor_variant = CORPORATE_SURVIVOR - -/datum/equipment_preset/survivor/wy/asstmanager/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/manager(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/grant, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/navy(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_R_STORE) - add_survivor_weapon_civilian(new_human) - ..() diff --git a/code/modules/gear_presets/survivors/shivas_snowball/preset_shivas_snowball.dm b/code/modules/gear_presets/survivors/shivas_snowball/preset_shivas_snowball.dm deleted file mode 100644 index c13b2098218..00000000000 --- a/code/modules/gear_presets/survivors/shivas_snowball/preset_shivas_snowball.dm +++ /dev/null @@ -1,82 +0,0 @@ -/datum/equipment_preset/survivor/corporate/shiva - name = "Survivor - Shivas Corporate Liaison" - assignment = "Shivas Corporate Liaison" - -/datum/equipment_preset/survivor/corporate/shiva/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/corporate_formal(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/snow(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/navy(new_human), WEAR_JACKET) - ..() - -/datum/equipment_preset/survivor/doctor/shiva - name = "Survivor - Shivas Doctor" - assignment = "Shivas Doctor" - -/datum/equipment_preset/survivor/doctor/shiva/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/green(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/green(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/snow(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) - ..() - -/datum/equipment_preset/survivor/scientist/shiva - name = "Survivor - Shivas Researcher" - assignment = "Shivas Researcher" - -/datum/equipment_preset/survivor/scientist/shiva/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/blue(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/tox(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/snow(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/purple(new_human), WEAR_JACKET) - ..() - -/datum/equipment_preset/survivor/colonial_marshal/shiva - name = "Survivor - Shivas Colonial Marshal Deputy" - assignment = "CMB Deputy" - -/datum/equipment_preset/survivor/colonial_marshal/shiva/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/red(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/engineer/shiva - name = "Survivor - Shivas Engineer" - assignment = "Shivas Engineer" - -/datum/equipment_preset/survivor/engineer/shiva/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/yellow(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/snow(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - ..() - -/datum/equipment_preset/survivor/security/shiva - name = "Survivor - Shivas Security Guard" - assignment = "United Americas Peacekeeper" - -/datum/equipment_preset/survivor/security/shiva/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - ..() diff --git a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm b/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm deleted file mode 100644 index 93c0f9b2ac6..00000000000 --- a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm +++ /dev/null @@ -1,191 +0,0 @@ -//those preset are only used on this insert. -// /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc - -/datum/equipment_preset/survivor/pmc - name = "Survivor - PMC" - flags = EQUIPMENT_PRESET_START_OF_ROUND - assignment = "Weyland-Yutani PMC" - faction = FACTION_SURVIVOR - faction_group = list(FACTION_WY, FACTION_SURVIVOR) - paygrades = list(PAY_SHORT_PMC_OP = JOB_PLAYTIME_TIER_0) - idtype = /obj/item/card/id/pmc - skills = /datum/skills/civilian/survivor/pmc - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) - access = list( - ACCESS_WY_GENERAL, - ACCESS_WY_COLONIAL, - ACCESS_WY_MEDICAL, - ACCESS_WY_SECURITY, - ACCESS_WY_RESEARCH, - ACCESS_WY_ARMORY, - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) - -/datum/equipment_preset/survivor/pmc/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/hvh, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) - add_pmc_survivor_weapon(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/rmc, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf, WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) - - ..() -// /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_medic - -/datum/equipment_preset/survivor/pmc/medic - name = "Survivor - PMC Medic" - assignment = JOB_PMC_MEDIC - paygrades = list(PAY_SHORT_PMC_MS = JOB_PLAYTIME_TIER_0) - skills = /datum/skills/civilian/survivor/pmc/medic - -/datum/equipment_preset/survivor/pmc/medic/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human), WEAR_IN_BACK) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_R_HAND) - - ..() -// /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_engineer - -/datum/equipment_preset/survivor/pmc/engineer - name = "Survivor - PMC Engineer" - assignment = JOB_PMC_ENGINEER - paygrades = list(PAY_SHORT_PMC_TEC = JOB_PLAYTIME_TIER_0) - skills = /datum/skills/civilian/survivor/pmc/engineer - -/datum/equipment_preset/survivor/pmc/engineer/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/med_small_stack(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_R_HAND) - - ..() - -// /obj/effect/landmark/survivor_spawner/bigred_crashed_cl - -/datum/equipment_preset/survivor/wy/manager - name = "Survivor - Corporate Supervisor" - flags = EQUIPMENT_PRESET_EXTRA - paygrades = list(PAY_SHORT_WYC6 = JOB_PLAYTIME_TIER_0) - skills = /datum/skills/civilian/survivor/manager - assignment = "Colony Supervisor" - role_comm_title = "Supervisor" - idtype = /obj/item/card/id/silver/clearance_badge/manager - faction_group = list(FACTION_WY, FACTION_SURVIVOR) - access = list( - ACCESS_WY_GENERAL, - ACCESS_WY_COLONIAL, - ACCESS_WY_MEDICAL, - ACCESS_WY_SECURITY, - ACCESS_WY_RESEARCH, - ACCESS_WY_ARMORY, - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ACCESS_ILLEGAL_PIRATE, - ) - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) - - survivor_variant = CORPORATE_SURVIVOR - -/datum/equipment_preset/survivor/wy/manager/load_gear(mob/living/carbon/human/new_human) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/manager(new_human), WEAR_BODY) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/grant, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/manager(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/manager(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) - add_pmc_survivor_weapon(new_human) - add_random_cl_survivor_loot(new_human) - - ..() -// only used on the spawner of all of those above... -/datum/equipment_preset/synth/survivor/pmc - name = "Survivor - Synthetic - PMC Support Synth" - faction = FACTION_SURVIVOR - faction_group = list(FACTION_WY, FACTION_SURVIVOR) - access = list( - ACCESS_WY_GENERAL, - ACCESS_WY_COLONIAL, - ACCESS_WY_MEDICAL, - ACCESS_WY_SECURITY, - ACCESS_WY_RESEARCH, - ACCESS_WY_ARMORY, - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) - idtype = /obj/item/card/id/pmc - assignment = JOB_PMC_SYNTH - rank = JOB_PMC_SYNTH - role_comm_title = "WY Syn" - -/datum/equipment_preset/synth/survivor/pmc/load_race(mob/living/carbon/human/new_human) - new_human.set_species(SYNTH_GEN_THREE) - -/datum/equipment_preset/synth/survivor/pmc/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/scalpel/manager, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/flask/weylandyutani, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/synth, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_JACKET) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/command/hvh, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/rmc, WEAR_FEET) - - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/smartpack/white, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/upgraded, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/crew_monitor, WEAR_IN_BACK) - - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full/dutch, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/nailgun/compact, WEAR_J_STORE) - - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver/tactical, WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/wirecutters/tactical, WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/wrench, WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full_barbed_wire, WEAR_R_STORE) diff --git a/code/modules/gear_presets/survivors/solaris/preset_solaris.dm b/code/modules/gear_presets/survivors/solaris/preset_solaris.dm deleted file mode 100644 index c5ac3c41e1e..00000000000 --- a/code/modules/gear_presets/survivors/solaris/preset_solaris.dm +++ /dev/null @@ -1,109 +0,0 @@ -/datum/equipment_preset/survivor/trucker/solaris - name = "Survivor - Solaris Heavy Vehicle Operator" - assignment = "Solaris Heavy Vehicle Operator" - skills = /datum/skills/civilian/survivor/trucker - -/datum/equipment_preset/survivor/trucker/solaris/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls/red(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/trucker/red(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big(new_human), WEAR_EYES) - ..() - -/datum/equipment_preset/survivor/colonial_marshal/solaris - name = "Survivor - Solaris Colonial Marshal Deputy" - assignment = "CMB Deputy" - -/datum/equipment_preset/survivor/colonial_marshal/solaris/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/engineer/solaris - name = "Survivor - Solaris Engineer" - assignment = "Solaris Engineer" - -/datum/equipment_preset/survivor/engineer/solaris/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/pink(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/yellow(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) - ..() - -/datum/equipment_preset/survivor/scientist/solaris - name = "Survivor - Solaris Scientist" - assignment = "Solaris Scientist" - -/datum/equipment_preset/survivor/scientist/solaris/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/corporate_formal(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/doctor/solaris - name = "Survivor - Solaris Doctor" - assignment = "Solaris Doctor" - -/datum/equipment_preset/survivor/doctor/solaris/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/lightblue(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmo(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/chaplain/solaris - name = "Survivor - Solaris Chaplain" - assignment = "Solaris Chaplain" - -/datum/equipment_preset/survivor/chaplain/solaris/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/holidaypriest(new_human), WEAR_JACKET) - ..() - -/datum/equipment_preset/survivor/security/solaris - name = "Survivor - Solaris United Americas Peacekeepers" - assignment = "United Americas Peacekeeper" - -/datum/equipment_preset/survivor/security/solaris/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/sec/hos(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/uscm/solaris - name = "Survivor - Solaris United States Colonial Marine Corps Recruiter" - assignment = "USCM Recruiter" - paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0) - -/datum/equipment_preset/survivor/uscm/solaris/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/ranks/marine/e5(new_human), WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/service(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/full(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) - ..() - -/datum/equipment_preset/survivor/corporate/solaris - name = "Survivor - Solaris Corporate Liaison" - assignment = "Solaris Corporate Liaison" - -/datum/equipment_preset/survivor/corporate/solaris/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/ivy(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup/brown(new_human), WEAR_FEET) - ..() diff --git a/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm b/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm deleted file mode 100644 index 8bed16b00b7..00000000000 --- a/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm +++ /dev/null @@ -1,73 +0,0 @@ -/datum/equipment_preset/survivor/engineer/soro - name = "Survivor - Sorokyne Strata State Contractor" - assignment = "Sorokyne Strata State Contractor" - -/datum/equipment_preset/survivor/engineer/soro/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/soviet(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) - ..() - -/datum/equipment_preset/survivor/security/soro - name = "Survivor - Sorokyne Strata Security" - assignment = "Sorokyne Strata Security" - -/datum/equipment_preset/survivor/security/soro/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/veteran/soviet_uniform_01(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/soviet(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) - ..() - -/datum/equipment_preset/survivor/doctor/soro - name = "Survivor - Sorokyne Strata Doctor" - assignment = "Sorokyne Strata Doctor" - -/datum/equipment_preset/survivor/doctor/soro/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/veteran/soviet_uniform_01(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - ..() - -/datum/equipment_preset/survivor/scientist/soro - name = "Survivor - Sorokyne Strata Researcher" - assignment = "Sorokyne Strata Researcher" - -/datum/equipment_preset/survivor/scientist/soro/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/blue(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/tox(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor(new_human), WEAR_JACKET) - ..() - -/datum/equipment_preset/survivor/interstellar_human_rights_observer/soro - name = "Survivor - Sorokyne Interstellar Human Rights Observer" - assignment = "Interstellar Human Rights Observer(Sorokyne)" - - -/datum/equipment_preset/survivor/interstellar_human_rights_observer/soro/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - ..() - -/datum/equipment_preset/survivor/corporate/soro - name = "Survivor - Sorokyne Strata Corporate Liaison" - assignment = "Sorokyne Strata Corporate Liaison" - -/datum/equipment_preset/survivor/corporate/soro/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/charcoal(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/liaison/modified(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - ..() diff --git a/code/modules/gear_presets/survivors/survivors.dm b/code/modules/gear_presets/survivors/survivors.dm index 45bf51dcb83..1a51e5bd92e 100644 --- a/code/modules/gear_presets/survivors/survivors.dm +++ b/code/modules/gear_presets/survivors/survivors.dm @@ -111,7 +111,7 @@ /* From map_config.dm -Standart Survivors : /datum/equipment_preset/survivor/scientist, +Standard Survivors : /datum/equipment_preset/survivor/scientist, /datum/equipment_preset/survivor/doctor, /datum/equipment_preset/survivor/chef, /datum/equipment_preset/survivor/chaplain, @@ -121,394 +121,3 @@ Standart Survivors : /datum/equipment_preset/survivor/scientist, /datum/equipment_preset/survivor/security */ - - -// 1 ----- Scientist Survivor - -/datum/equipment_preset/survivor/scientist - name = "Survivor - Scientist" - assignment = "Scientist" - skills = /datum/skills/civilian/survivor/scientist - flags = EQUIPMENT_PRESET_START_OF_ROUND - idtype = /obj/item/card/id/silver/clearance_badge/scientist - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_MEDBAY) - paygrades = list(PAY_SHORT_CDOC = JOB_PLAYTIME_TIER_0) - - survivor_variant = SCIENTIST_SURVIVOR - -/datum/equipment_preset/survivor/scientist/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/virologist(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/virologist(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/green(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/tox(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/green(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/good(new_human), WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical/full(new_human), WEAR_R_STORE) - add_survivor_weapon_civilian(new_human) - add_random_survivor_research_gear(new_human) - add_ice_colony_survivor_equipment(new_human) - ..() - -// 2 ----- Doctor Survivor - -/datum/equipment_preset/survivor/doctor - name = "Survivor - Doctor" - assignment = "Doctor" - skills = /datum/skills/civilian/survivor/doctor - flags = EQUIPMENT_PRESET_START_OF_ROUND - idtype = /obj/item/card/id/silver/clearance_badge - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_COMMAND) - paygrades = list(PAY_SHORT_CDOC = JOB_PLAYTIME_TIER_0) - - survivor_variant = MEDICAL_SURVIVOR - -/datum/equipment_preset/survivor/doctor/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/med(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(new_human), WEAR_JACKET) - var/random_gear = rand(0,4) - switch(random_gear) - if(0) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_R_STORE) - if(1) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical/full(new_human), WEAR_R_STORE) - if(2) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_R_STORE) - if(3) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/first_responder/full(new_human), WEAR_R_STORE) - if(4) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced(new_human), WEAR_R_STORE) - add_random_survivor_medical_gear(new_human) - add_survivor_weapon_civilian(new_human) - add_ice_colony_survivor_equipment(new_human) - ..() - -// 3 ----- Chef Survivor - -/datum/equipment_preset/survivor/chef - name = "Survivor - Chef" - assignment = "Chef" - skills = /datum/skills/civilian/survivor/chef - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC) - -/datum/equipment_preset/survivor/chef/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chef(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/chef(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/chefhat(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/tool/kitchen/rollingpin(new_human.back), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general(new_human), WEAR_R_STORE) - add_survivor_weapon_civilian(new_human) - add_ice_colony_survivor_equipment(new_human) - ..() - -// 4 ----- Chaplain Survivor - -/datum/equipment_preset/survivor/chaplain - name = "Survivor - Chaplain" - assignment = "Chaplain" - skills = /datum/skills/civilian/survivor/chaplain - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC) - -/datum/equipment_preset/survivor/chaplain/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/holidaypriest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/bible/booze(new_human.back), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general(new_human), WEAR_R_STORE) - add_survivor_weapon_civilian(new_human) - add_ice_colony_survivor_equipment(new_human) - ..() - -// 5 ----- Miner Survivor - -/datum/equipment_preset/survivor/miner - name = "Survivor - Miner" - assignment = "Miner" - skills = /datum/skills/civilian/survivor/miner - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_ENGINEERING, ACCESS_CIVILIAN_LOGISTICS) - -/datum/equipment_preset/survivor/miner/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/yellow(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/tool/pickaxe(new_human), WEAR_R_HAND) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/orange(new_human), WEAR_HEAD) - add_survivor_weapon_civilian(new_human) - add_ice_colony_survivor_equipment(new_human) - ..() - -// 6 ---- Colonial Marshal Survivor - -/datum/equipment_preset/survivor/colonial_marshal - name = "Survivor - Colonial Marshal Deputy" - assignment = "CMB Deputy" - paygrades = list(PAY_SHORT_CMBD = JOB_PLAYTIME_TIER_0) - skills = /datum/skills/civilian/survivor/marshal - flags = EQUIPMENT_PRESET_START_OF_ROUND - idtype = /obj/item/card/id/deputy - role_comm_title = "CMB DEP" - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) - - survivor_variant = SECURITY_SURVIVOR - -/datum/equipment_preset/survivor/colonial_marshal/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord(new_human), WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB(new_human), WEAR_HEAD) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large(new_human), WEAR_R_STORE) - add_survivor_weapon_security(new_human) - add_ice_colony_survivor_equipment(new_human) - ..() - -// 7 ----- Engineering Survivor - -/datum/equipment_preset/survivor/engineer - name = "Survivor - Engineer" - assignment = "Engineer" - skills = /datum/skills/civilian/survivor/engineer - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_CIVILIAN_ENGINEERING,ACCESS_CIVILIAN_LOGISTICS) - - survivor_variant = ENGINEERING_SURVIVOR - -/datum/equipment_preset/survivor/engineer/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/brown(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/yellow(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/med_small_stack(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) - add_survivor_weapon_civilian(new_human) - add_ice_colony_survivor_equipment(new_human) - ..() - -// 8 -- Security Survivor - -/datum/equipment_preset/survivor/security - name = "Survivor - Security" - assignment = "Security" - skills = /datum/skills/civilian/survivor/marshal - flags = EQUIPMENT_PRESET_START_OF_ROUND - idtype = /obj/item/card/id/data - access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_CIVILIAN_BRIG,ACCESS_CIVILIAN_COMMAND) - paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) - - survivor_variant = SECURITY_SURVIVOR - -/datum/equipment_preset/survivor/security/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(new_human), WEAR_HEAD) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine(new_human), WEAR_R_STORE) - add_survivor_weapon_security(new_human) - add_ice_colony_survivor_equipment(new_human) - ..() - -/* -Everything bellow is a parent used as a base for one or multiple maps. -*/ - -// ----- CL Survivor - -// Used in Solaris Ridge and LV-624. - -/datum/equipment_preset/survivor/corporate - name = "Survivor - Corporate Liaison" - assignment = "Corporate Liaison" - skills = /datum/skills/civilian/survivor - flags = EQUIPMENT_PRESET_START_OF_ROUND - paygrades = list(PAY_SHORT_WYC2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_WYC3 = JOB_PLAYTIME_TIER_2, PAY_SHORT_WYC4 = JOB_PLAYTIME_TIER_3, PAY_SHORT_WYC5 = JOB_PLAYTIME_TIER_4) - faction_group = FACTION_LIST_SURVIVOR_WY - idtype = /obj/item/card/id/silver/clearance_badge/cl - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_COMMAND, - ACCESS_WY_GENERAL, - ACCESS_WY_COLONIAL, - ACCESS_WY_EXEC, - ) - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) - - survivor_variant = CORPORATE_SURVIVOR - -/datum/equipment_preset/survivor/corporate/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/field(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - add_survivor_weapon_civilian(new_human) - add_random_cl_survivor_loot(new_human) - add_ice_colony_survivor_equipment(new_human) - ..() - -// ---- Trucker Survivor - -// Used in Kutjevo Refinery, LV-624, New Varadero, Solaris Ridge and Trijent Dam. - -/datum/equipment_preset/survivor/trucker - name = "Survivor - Trucker" - assignment = "Trucker" - skills = /datum/skills/civilian/survivor/trucker - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_CIVILIAN_ENGINEERING,ACCESS_CIVILIAN_LOGISTICS) - - survivor_variant = ENGINEERING_SURVIVOR - -/datum/equipment_preset/survivor/trucker/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/overalls(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/yellow(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(new_human.back), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/hardpoint/locomotion/van_wheels(new_human), WEAR_R_HAND) - add_survivor_weapon_civilian(new_human) - add_ice_colony_survivor_equipment(new_human) - ..() - -// -- Flight Control Operator - -// Used in Solaris Ridge. - -/datum/equipment_preset/survivor/flight_control_operator - name = "Survivor - Flight Control Operator" - assignment = "Flight Control Operator" - skills = /datum/skills/civilian/survivor/trucker - idtype = /obj/item/card/id/data - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_CIVILIAN_LOGISTICS,ACCESS_WY_FLIGHT) - -/datum/equipment_preset/survivor/flight_control_operator/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/khaki(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/windbreaker_brown(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/aviator(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/binoculars(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/headset(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - add_survivor_weapon_civilian(new_human) - add_ice_colony_survivor_equipment(new_human) - ..() - -// ----- Interstellar Human Rights Survivor - -// Used in Sorokyne Strata and Fiorina Science Annex. -/datum/equipment_preset/survivor/interstellar_human_rights_observer - name = "Survivor - Interstellar Human Rights Observer" - assignment = "Interstellar Human Rights Observer(Colony)" - skills = /datum/skills/civilian/survivor - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_CIVILIAN_COMMAND) - -/datum/equipment_preset/survivor/interstellar_human_rights_observer/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/brown(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup/brown(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) - add_survivor_weapon_civilian(new_human) - add_random_cl_survivor_loot(new_human) - add_ice_colony_survivor_equipment(new_human) - ..() - - -// ----- Interstellar Commerce Commission Survivor - -// Used in Trijent Dam and New Varadero. -/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison - name = "Survivor - Interstellar Commerce Commission Liaison" - assignment = "Interstellar Commerce Commission Corporate Liaison" - skills = /datum/skills/civilian/survivor - flags = EQUIPMENT_PRESET_START_OF_ROUND - paygrades = list(PAY_SHORT_ICCL = JOB_PLAYTIME_TIER_0) - faction_group = FACTION_LIST_SURVIVOR_WY - idtype = /obj/item/card/id/silver/cl - role_comm_title = "ICC Rep." - - survivor_variant = CORPORATE_SURVIVOR - -/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison/New() - . = ..() - access = get_access(ACCESS_LIST_CIVIL_LIAISON) - -/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/aviator(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/black(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) - add_survivor_weapon_civilian(new_human) - add_random_cl_survivor_loot(new_human) - add_ice_colony_survivor_equipment(new_human) - ..() - -// ----- USCM Survivor - -// Used for Solaris Ridge. -/datum/equipment_preset/survivor/uscm - name = "Survivor - USCM Remnant" - assignment = "USCM Survivor" - skills = /datum/skills/civilian/survivor/marshal - idtype = /obj/item/card/id/dogtag - paygrades = list(PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_0) - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC) - -/datum/equipment_preset/survivor/uscm/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/ranks/marine/e2(new_human), WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare(new_human), WEAR_R_STORE) - add_survivor_weapon_security(new_human) - add_ice_colony_survivor_equipment(new_human) - ..() diff --git a/code/modules/gear_presets/survivors/trijent/preset_trijent.dm b/code/modules/gear_presets/survivors/trijent/preset_trijent.dm deleted file mode 100644 index 4550a98a590..00000000000 --- a/code/modules/gear_presets/survivors/trijent/preset_trijent.dm +++ /dev/null @@ -1,105 +0,0 @@ -/datum/equipment_preset/survivor/chaplain/trijent - name = "Survivor - Trijent Chaplain" - assignment = "Trijent Dam Chaplain" - -/datum/equipment_preset/survivor/chaplain/trijent/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/nun(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/nun_hood(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/holidaypriest(new_human), WEAR_JACKET) - ..() - -/datum/equipment_preset/survivor/security/trijent - name = "Survivor - Trijent Security Guard" - assignment = "Trijent Dam Security Guard" - -/datum/equipment_preset/survivor/security/trijent/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/colonial_marshal/trijent - name = "Survivor - Trijent Colonial Marshal Deputy" - assignment = "CMB Deputy" - -/datum/equipment_preset/survivor/colonial_marshal/trijent/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/doctor/trijent - name = "Survivor - Trijent Doctor" - assignment = "Trijent Dam Doctor" - -/datum/equipment_preset/survivor/doctor/trijent/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/blue(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/blue(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/scientist/trijent - name = "Survivor - Trijent Researcher" - assignment = "Trijent Dam Researcher" - -/datum/equipment_preset/survivor/scientist/trijent/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/rd(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/jan(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/researcher(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup/brown(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/trucker/trijent - name = "Survivor - Trijent Heavy Vehicle Operator" - assignment = "Trijent Dam Heavy Vehicle Operator" - skills = /datum/skills/civilian/survivor/trucker - -/datum/equipment_preset/survivor/trucker/trijent/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/green(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/bomber/grey(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/trucker(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank(new_human), WEAR_IN_BACK) - ..() - -/datum/equipment_preset/survivor/engineer/trijent/hydro - name = "Survivor - Hydro Electric Engineer" - assignment = "Hydro Electric Engineer" - -/datum/equipment_preset/survivor/engineer/trijent/hydro/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/khaki(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/black(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat(new_human), WEAR_HEAD) - ..() - -/datum/equipment_preset/survivor/engineer/trijent - name = "Survivor - Dam Maintenance Technician" - assignment = "Dam Maintenance Technician" - -/datum/equipment_preset/survivor/engineer/trijent/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/engi(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/orange(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/corporate/trijent - name = "Survivor - Trijent Corporate Liaison" - assignment = "Trijent Dam Corporate Liaison" - -/datum/equipment_preset/survivor/corporate/trijent/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/ivy(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - ..() diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index 7bb5a705334..5ed2902743f 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -168,6 +168,7 @@ /datum/equipment_preset/synth/survivor/pmc/New() . = ..() + name = "Survivor - Synthetic - PMC JOE ABSTRACT" access = get_access(ACCESS_LIST_WY_PMC) /datum/equipment_preset/synth/survivor/wy diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index 2d29f949ac2..9641f6dfcad 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -169,25 +169,9 @@ //face new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/solardevils/upp, WEAR_L_EAR) //head - var/maybeberet = rand(1,3) - switch(maybeberet) - if(1) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/upp, WEAR_HEAD) - if(2) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/upp/alt, WEAR_HEAD) - if(3) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD) + add_upp_head(new_human) //uniform - var/obj/item/clothing/under/marine/veteran/UPP/uniform = new() - var/random_uniform = rand(1,2) - switch(random_uniform) - if(1) - uniform.roll_suit_jacket(new_human) - if(2) - uniform.roll_suit_sleeves(new_human) - new_human.equip_to_slot_or_del(uniform, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY) + add_upp_uniform(new_human) //jacket new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_JACKET) @@ -237,23 +221,9 @@ else new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES) //head - var/maybeberet = rand(1,3) - switch(maybeberet) - if(1 to 2) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/upp, WEAR_HEAD) - if(3) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD) + add_upp_head(new_human) //uniform - var/obj/item/clothing/under/marine/veteran/UPP/uniform = new() - var/random_uniform = rand(1,2) - switch(random_uniform) - if(1) - uniform.roll_suit_jacket(new_human) - if(2) - uniform.roll_suit_sleeves(new_human) - new_human.equip_to_slot_or_del(uniform, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY) + add_upp_uniform(new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/light, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/carbine, WEAR_J_STORE) //waist @@ -292,25 +262,9 @@ //face new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/solardevils/upp, WEAR_L_EAR) //head - var/maybeberet = rand(1,3) - switch(maybeberet) - if(1) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/upp, WEAR_HEAD) - if(2) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/upp/alt, WEAR_HEAD) - if(3) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD) + add_upp_head(new_human) //uniform - var/obj/item/clothing/under/marine/veteran/UPP/uniform = new() - var/random_uniform = rand(1,2) - switch(random_uniform) - if(1) - uniform.roll_suit_jacket(new_human) - if(2) - uniform.roll_suit_sleeves(new_human) - new_human.equip_to_slot_or_del(uniform, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY) + add_upp_uniform(new_human) //jacket new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner/upp, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pkp/iff, WEAR_J_STORE) @@ -351,25 +305,9 @@ //face new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/solardevils/upp, WEAR_L_EAR) //head - var/maybeberet = rand(1,3) - switch(maybeberet) - if(1) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/upp, WEAR_HEAD) - if(2) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/upp/alt, WEAR_HEAD) - if(3) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD) + add_upp_head(new_human) //uniform - var/obj/item/clothing/under/marine/veteran/UPP/uniform = new() - var/random_uniform = rand(1,2) - switch(random_uniform) - if(1) - uniform.roll_suit_jacket(new_human) - if(2) - uniform.roll_suit_sleeves(new_human) - new_human.equip_to_slot_or_del(uniform, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY) + add_upp_uniform(new_human) //jacket new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_JACKET) @@ -410,25 +348,9 @@ //face new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/solardevils/upp, WEAR_L_EAR) //head - var/maybeberet = rand(1,3) - switch(maybeberet) - if(1) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/upp, WEAR_HEAD) - if(2) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/upp/alt, WEAR_HEAD) - if(3) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD) + add_upp_head(new_human) //uniform - var/obj/item/clothing/under/marine/veteran/UPP/uniform = new() - var/random_uniform = rand(1,2) - switch(random_uniform) - if(1) - uniform.roll_suit_jacket(new_human) - if(2) - uniform.roll_suit_sleeves(new_human) - new_human.equip_to_slot_or_del(uniform, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY) + add_upp_uniform(new_human) //jacket new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_JACKET) @@ -465,9 +387,7 @@ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD) //uniform - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY) + add_upp_uniform(new_human) //jacket new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/light/pap, WEAR_JACKET) //waist @@ -573,12 +493,7 @@ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/solardevils/upp, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES) //head - var/helmetvariety = rand(1,2) - switch(helmetvariety) - if(1) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/upp, WEAR_HEAD) - if(2) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/upp/alt, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD) //uniform new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/boilersuit/khaki, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/drop_black/equipped, WEAR_ACCESSORY) @@ -695,7 +610,6 @@ new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) - //face new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/kdo, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/upp, WEAR_FACE) @@ -753,12 +667,10 @@ //face new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) //head - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/upp, WEAR_HEAD) + add_upp_head(new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding, WEAR_EYES) //uniform - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY) + add_upp_uniform(new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/tool_webbing/equipped, WEAR_R_STORE) //jacket new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/light/pap, WEAR_JACKET) @@ -788,18 +700,10 @@ //face new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) //head - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/upp, WEAR_HEAD) + add_upp_head(new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/aviator, WEAR_EYES) //uniform - var/obj/item/clothing/under/marine/veteran/UPP/uniform = new() - var/random_uniform = rand(1,2) - switch(random_uniform) - if(1) - uniform.roll_suit_jacket(new_human) - if(2) - uniform.roll_suit_sleeves(new_human) - new_human.equip_to_slot_or_del(uniform, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) + add_upp_uniform(new_human) //jacket new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/light/pap, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/revolver, WEAR_J_STORE) @@ -868,63 +772,15 @@ /datum/equipment_preset/upp/colonist/load_gear(mob/living/carbon/human/new_human) new_human.undershirt = "undershirt" + //back + add_random_satchel(new_human) + //face new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) - var/random_civilian_satchel= rand(1,3) - switch(random_civilian_satchel) - if(1) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - if(2) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) - if(3) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/blue(new_human), WEAR_BACK) - - var/random_civilian_uniform= rand(1,9) - switch(random_civilian_uniform) - if(1) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/boilersuit/khaki(new_human), WEAR_BODY) - if(2) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/boilersuit/cyan(new_human), WEAR_BODY) - if(3) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/boilersuit/grey(new_human), WEAR_BODY) - if(4) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/blue(new_human), WEAR_BODY) - if(5) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/khaki(new_human), WEAR_BODY) - if(6) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/pink(new_human), WEAR_BODY) - if(7) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/green(new_human), WEAR_BODY) - if(8) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/brown(new_human), WEAR_BODY) - if(9) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue(new_human), WEAR_BODY) - - var/random_civilian_jacket= rand(1,12) - switch(random_civilian_jacket) - if(1) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/corporate/brown(new_human), WEAR_JACKET) - if(2) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/corporate/blue(new_human), WEAR_JACKET) - if(3) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/corporate(new_human), WEAR_JACKET) - if(4) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/windbreaker_yellow(new_human), WEAR_JACKET) - if(5) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/windbreaker_brown(new_human), WEAR_JACKET) - if(6) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/windbreaker_blue(new_human), WEAR_JACKET) - if(7) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/windbreaker_green(new_human), WEAR_JACKET) - if(8) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/vest(new_human), WEAR_JACKET) - if(9) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/vest/tan(new_human), WEAR_JACKET) - if(10) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/vest/grey(new_human), WEAR_JACKET) - if(11) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls(new_human), WEAR_JACKET) - if(12) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls/tan(new_human), WEAR_JACKET) + //uniform + add_civilian_uniform(new_human) + //jacket + add_civilian_jacket(new_human) + //limbs var/random_civilian_shoe = rand(1,7) switch(random_civilian_shoe) if(1 to 2) @@ -951,53 +807,26 @@ /datum/equipment_preset/upp/researcher/load_gear(mob/living/carbon/human/new_human) new_human.undershirt = "undershirt" + //back + add_random_satchel(new_human) + //face new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) - var/random_civilian_satchel= rand(1,3) - switch(random_civilian_satchel) - if(1) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BODY) - if(2) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BODY) - if(3) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/blue(new_human), WEAR_BODY) - - var/random_professional_uniform= rand(1,3) - switch(random_professional_uniform) - if(1) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/brown(new_human), WEAR_BODY) - if(2) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue(new_human), WEAR_BODY) - if(3) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black(new_human), WEAR_BODY) - - var/random_tie= rand(1,6) - switch(random_tie) - if(1) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/black(new_human), WEAR_ACCESSORY) - if(2) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/blue(new_human), WEAR_ACCESSORY) - if(3) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/green(new_human), WEAR_ACCESSORY) - if(4) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/purple(new_human), WEAR_ACCESSORY) - if(6) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/red(new_human), WEAR_ACCESSORY) - - var/random_archeologist_suit = rand(1,4) - switch(random_archeologist_suit) + //uniform + add_professionalwear(new_human) + add_tie(new_human) + //jacket + var/random_researcher_suit = rand(1,5) + switch(random_researcher_suit) if(1 to 2) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(new_human), WEAR_JACKET) if(3) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/vest/tan(new_human), WEAR_JACKET) if(4) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/vest(new_human), WEAR_JACKET) - - var/random_professional_shoe = rand(1,2) - switch(random_professional_shoe) - if(1) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup/brown(new_human), WEAR_FEET) - if(2) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + if(5) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/vest/grey(new_human), WEAR_JACKET) + //limb + add_dress_shoes(new_human) /datum/equipment_preset/upp/doctor diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 7872256ba9e..a13328c2b3e 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -405,7 +405,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/qm_suit(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/req/ro(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/khaki(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/flash(new_human), WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) @@ -440,7 +440,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/full(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/req(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/khaki(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) diff --git a/code/modules/gear_presets/wo.dm b/code/modules/gear_presets/wo.dm index 3ad7ad36290..28ad3fbd8ac 100644 --- a/code/modules/gear_presets/wo.dm +++ b/code/modules/gear_presets/wo.dm @@ -345,7 +345,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m44/custom(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/req(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/khaki(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) diff --git a/code/modules/mob/living/simple_animal/hostile/pirate.dm b/code/modules/mob/living/simple_animal/hostile/pirate.dm index e54c3a5cf5d..011c7062479 100644 --- a/code/modules/mob/living/simple_animal/hostile/pirate.dm +++ b/code/modules/mob/living/simple_animal/hostile/pirate.dm @@ -29,16 +29,7 @@ min_n2 = 0 max_n2 = 0 unsuitable_atoms_damage = 15 - var/corpse = /obj/effect/landmark/corpsespawner/realpirate - var/weapon1 = /obj/item/weapon/energy/sword/pirate faction = FACTION_PIRATE -/mob/living/simple_animal/hostile/pirate/death() - ..() - if(corpse) - new corpse (src.loc) - if(weapon1) - new weapon1 (src.loc) - qdel(src) - return + diff --git a/code/modules/mob/living/simple_animal/hostile/russian.dm b/code/modules/mob/living/simple_animal/hostile/russian.dm index 1394ec113e6..650c665066d 100644 --- a/code/modules/mob/living/simple_animal/hostile/russian.dm +++ b/code/modules/mob/living/simple_animal/hostile/russian.dm @@ -19,8 +19,6 @@ melee_damage_upper = 15 attacktext = "punches" a_intent = INTENT_HARM - var/corpse = /obj/effect/landmark/corpsespawner/russian - var/weapon1 = /obj/item/tool/kitchen/knife min_oxy = 5 max_oxy = 0 min_tox = 0 @@ -37,8 +35,6 @@ /mob/living/simple_animal/hostile/russian/ranged icon_state = "russianranged" icon_living = "russianranged" - corpse = /obj/effect/landmark/corpsespawner/russian/ranged - weapon1 = /obj/item/weapon/gun/pistol ranged = 1 projectiletype = /obj/projectile projectilesound = 'sound/weapons/Gunshot.ogg' @@ -66,8 +62,6 @@ melee_damage_upper = 15 attacktext = "punches" a_intent = INTENT_HARM - //var/corpse = /obj/effect/landmark/corpsespawner/russian - //var/weapon1 = /obj/item/tool/kitchen/knife min_oxy = 5 max_oxy = 0 min_tox = 0 @@ -82,25 +76,8 @@ /mob/living/simple_animal/hostile/UPP/ranged - //weapon1 = /obj/item/weapon/gun/projectile/mateba ranged = 1 projectiletype = /obj/projectile projectilesound = 'sound/weapons/Gunshot.ogg' casingtype = null - -/mob/living/simple_animal/hostile/russian/death() - ..() - if(corpse) - new corpse (src.loc) - if(weapon1) - new weapon1 (src.loc) - qdel(src) - return -/* -/mob/living/simple_animal/hostile/russian/UPP - name = "UPP Soldier" - icon_state = "uppmarine" - icon_living = "uppmarine" - icon_dead = "uppmarinedead" -*/ diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index f0dfdc8925d..501b66f133c 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -321,7 +321,7 @@ var/list/survivor_types = pref_special_job_options[JOB_SURVIVOR] != ANY_SURVIVOR && length(SSmapping.configs[GROUND_MAP].survivor_types_by_variant[pref_special_job_options[JOB_SURVIVOR]]) ? SSmapping.configs[GROUND_MAP].survivor_types_by_variant[pref_special_job_options[JOB_SURVIVOR]] : SSmapping.configs[GROUND_MAP].survivor_types if(length(survivor_types)) return pick(survivor_types) - return /datum/equipment_preset/survivor + return /datum/equipment_preset/colonist if(JOB_SYNTH_SURVIVOR) var/list/survivor_types = pref_special_job_options[JOB_SURVIVOR] != ANY_SURVIVOR && length(SSmapping.configs[GROUND_MAP].synth_survivor_types_by_variant[pref_special_job_options[JOB_SURVIVOR]]) ? SSmapping.configs[GROUND_MAP].synth_survivor_types_by_variant[pref_special_job_options[JOB_SURVIVOR]] : SSmapping.configs[GROUND_MAP].synth_survivor_types if(length(survivor_types)) diff --git a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm index 9cc5ef95450..affc07d8f96 100644 --- a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm @@ -60,6 +60,21 @@ /obj/item/ammo_box/magazine/heap/empty empty = TRUE +//-----------------------M20A Rifle Mag Boxes----------------------- + +/obj/item/ammo_box/magazine/m20a + name = "magazine box (M20A x 10)" + icon_state = "base_m41" + flags_equip_slot = SLOT_BACK + overlay_ammo_type = "_reg" + overlay_content = "_reg" + overlay_gun_type = "_m20a" + magazine_type = /obj/item/ammo_magazine/rifle/m20a + +/obj/item/ammo_box/magazine/m20a/empty + + empty = TRUE + //-----------------------M39 Rifle Mag Boxes----------------------- /obj/item/ammo_box/magazine/m39 diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 4a79b1904b8..2eee7810bb3 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -2101,6 +2101,21 @@ Defined in conflicts.dm of the #defines folder. gun.recalculate_attachment_bonuses() gun.update_overlays(src, "stock") +/obj/item/attachable/stock/m20a + name = "\improper M20A stock" + desc = "The M20A's standard polymer collapsible stock. When extended, it improves scatter, accuracy, and recoil, but slightly hinders agility." + slot = "stock" + melee_mod = 5 + size_mod = 1 + icon_state = "m20astock" + attach_icon = "m20astock_a" + pixel_shift_x = 40 + pixel_shift_y = 14 + hud_offset_mod = 3 + +/obj/item/attachable/stock/m20a/New() + ..() + /obj/item/attachable/stock/m16 name = "\improper M16 bump stock" desc = "Technically illegal in the state of California." @@ -3215,6 +3230,17 @@ Defined in conflicts.dm of the #defines folder. return to_chat(user, SPAN_WARNING("[src] only accepts shotgun buckshot.")) +/obj/item/attachable/attached_gun/shotgun/m20a + name = "\improper U3 underbarrel shotgun" + desc = "An ARMAT U3 tactical shotgun. Integrated into the M20A Harrington rifle. Only capable of loading up to five buckshot shells." + icon_state = "masterkey" + attach_icon = "masterkey_a" + flags_attach_features = ATTACH_ACTIVATION|ATTACH_PROJECTILE|ATTACH_RELOADABLE|ATTACH_WEAPON + hidden = TRUE + +/obj/item/attachable/attached_gun/shotgun/m20a/set_bullet_traits() + return + /obj/item/attachable/attached_gun/extinguisher name = "HME-12 underbarrel extinguisher" icon_state = "extinguisher" diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index 7986a271dd7..f33e7600037 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -444,6 +444,56 @@ desc = "Pulse action 10x24mm caseless assault rifle of the US Army, personal friend of any Trooper. This one has a U7 underbarrel shotgun strapped to it." starting_attachment_types = list(/obj/item/attachable/stock/rifle/collapsible, /obj/item/attachable/reddot, /obj/item/attachable/attached_gun/shotgun) +//M20A Harrington rifle +//================================================= +//================================================= + +/obj/item/weapon/gun/rifle/m20a + name = "\improper M20A pulse rifle" + desc = "A predecessor to the M41A pulse rifle still utilized by the UA's Colonial Guard and various other organizations. Aside from its 10x24mm chambering, the 'Harrington' rifle is largely considered to be in every metric the polar opposite of the M41A; featuring an obsolete three-round burst mode, lower magazine size, and it uses an integrated shotgun attachment." + icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' + icon_state = "m20a" + item_state = "m20a" + reload_sound = 'sound/weapons/handling/l42_reload.ogg' + unload_sound = 'sound/weapons/handling/l42_unload.ogg' + fire_sound = "gun_pulse" + current_mag = /obj/item/ammo_magazine/rifle/m20a + attachable_allowed = list( + /obj/item/attachable/suppressor, + /obj/item/attachable/bayonet, + /obj/item/attachable/bayonet/upp, + /obj/item/attachable/bayonet/co2, + /obj/item/attachable/reddot, + /obj/item/attachable/reflex, + /obj/item/attachable/flashlight, + /obj/item/attachable/lasersight, + /obj/item/attachable/flashlight/grip, + /obj/item/attachable/stock/m20a, + /obj/item/attachable/attached_gun/shotgun, + ) + + flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER + wield_delay = WIELD_DELAY_NORMAL + aim_slowdown = SLOWDOWN_ADS_RIFLE + starting_attachment_types = list(/obj/item/attachable/stock/m20a,/obj/item/attachable/attached_gun/shotgun/m20a) + map_specific_decoration = FALSE + +/obj/item/weapon/gun/rifle/m20a/set_gun_attachment_offsets() + attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 19,"rail_x" = 12, "rail_y" = 20, "under_x" = 18, "under_y" = 15, "stock_x" = 22, "stock_y" = 15) + +/obj/item/weapon/gun/rifle/m20a/set_gun_config_values() + ..() + set_fire_delay(FIRE_DELAY_TIER_9) + set_burst_amount(BURST_AMOUNT_TIER_3) + set_burst_delay(FIRE_DELAY_TIER_10) + accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_5 + accuracy_mult_unwielded = BASE_ACCURACY_MULT - HIT_ACCURACY_MULT_TIER_4 + damage_mult = BASE_BULLET_DAMAGE_MULT + recoil_unwielded = RECOIL_AMOUNT_TIER_4 + damage_falloff_mult = 0 + scatter = SCATTER_AMOUNT_TIER_8 + burst_scatter_mult = SCATTER_AMOUNT_TIER_8 + //---------------------------------------------- //Special gun for the CO to replace the smartgun diff --git a/code/modules/projectiles/magazines/rifles.dm b/code/modules/projectiles/magazines/rifles.dm index 2fe671d04c2..928355f0145 100644 --- a/code/modules/projectiles/magazines/rifles.dm +++ b/code/modules/projectiles/magazines/rifles.dm @@ -438,6 +438,19 @@ default_ammo = /datum/ammo/bullet/rifle/holo_target/hunting ammo_band_color = AMMO_BAND_COLOR_HOLOTARGETING +//M20A + +/obj/item/ammo_magazine/rifle/m20a + name = "\improper M20A magazine (10x24mm)" + desc = "A 10mm assault rifle magazine." + caliber = "10x24mm" + icon_state = "m20a" + default_ammo = /datum/ammo/bullet/rifle + max_rounds = 40 + gun_type = /obj/item/weapon/gun/rifle/m20a + w_class = SIZE_MEDIUM + ammo_band_icon = "+m20a_band" + ammo_band_icon_empty = "+m20a_band_e" //------------------------------------------------------- // NSG 23 ASSAULT RIFLE - PMC PRIMARY RIFLE diff --git a/colonialmarines.dme b/colonialmarines.dme index 141b5ac8395..8711804923f 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1830,21 +1830,7 @@ #include "code\modules\gear_presets\yautja.dm" #include "code\modules\gear_presets\survivors\misc.dm" #include "code\modules\gear_presets\survivors\survivors.dm" -#include "code\modules\gear_presets\survivors\corsat\preset_corsat.dm" -#include "code\modules\gear_presets\survivors\fiorina_sciannex\preset_fiorina_sciannex.dm" -#include "code\modules\gear_presets\survivors\fiorina_sciannex\riot_in_progress_insert_fiorina_nightmare.dm" -#include "code\modules\gear_presets\survivors\kutjevo\preset_kutjevo.dm" #include "code\modules\gear_presets\survivors\lv_522\forcon_survivors.dm" -#include "code\modules\gear_presets\survivors\lv_624\clfship_insert_lv624.dm" -#include "code\modules\gear_presets\survivors\lv_624\corporate_dome_insert_lv624.dm" -#include "code\modules\gear_presets\survivors\lv_624\preset_lv.dm" -#include "code\modules\gear_presets\survivors\new_varadero\preset_new_varadero.dm" -#include "code\modules\gear_presets\survivors\shivas_snowball\panic_room_insert_shivas.dm" -#include "code\modules\gear_presets\survivors\shivas_snowball\preset_shivas_snowball.dm" -#include "code\modules\gear_presets\survivors\solaris\crashlanding-offices_insert_bigred.dm" -#include "code\modules\gear_presets\survivors\solaris\preset_solaris.dm" -#include "code\modules\gear_presets\survivors\sorokyne_strata\preset_sorokyne_strata.dm" -#include "code\modules\gear_presets\survivors\trijent\preset_trijent.dm" #include "code\modules\holidays\halloween\decorators.dm" #include "code\modules\holidays\halloween\pumpkins\patches.dm" #include "code\modules\holidays\halloween\pumpkins\wearable.dm" diff --git a/icons/mob/humans/onmob/back.dmi b/icons/mob/humans/onmob/back.dmi index fd80df68302..3cfb10fc4c6 100644 Binary files a/icons/mob/humans/onmob/back.dmi and b/icons/mob/humans/onmob/back.dmi differ diff --git a/icons/mob/humans/onmob/feet.dmi b/icons/mob/humans/onmob/feet.dmi index afaa1ffdfc3..eb48792884e 100644 Binary files a/icons/mob/humans/onmob/feet.dmi and b/icons/mob/humans/onmob/feet.dmi differ diff --git a/icons/mob/humans/onmob/hands.dmi b/icons/mob/humans/onmob/hands.dmi index 163ad426ccf..09ca7b86943 100644 Binary files a/icons/mob/humans/onmob/hands.dmi and b/icons/mob/humans/onmob/hands.dmi differ diff --git a/icons/mob/humans/onmob/head_0.dmi b/icons/mob/humans/onmob/head_0.dmi index 1cac357cb25..251c7c508ad 100644 Binary files a/icons/mob/humans/onmob/head_0.dmi and b/icons/mob/humans/onmob/head_0.dmi differ diff --git a/icons/mob/humans/onmob/head_1.dmi b/icons/mob/humans/onmob/head_1.dmi index ba2c73ea3b6..76e4f7e0d24 100644 Binary files a/icons/mob/humans/onmob/head_1.dmi and b/icons/mob/humans/onmob/head_1.dmi differ diff --git a/icons/mob/humans/onmob/items_lefthand_0.dmi b/icons/mob/humans/onmob/items_lefthand_0.dmi index f88ec3a0f08..f7c5fa3bfb7 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_0.dmi and b/icons/mob/humans/onmob/items_lefthand_0.dmi differ diff --git a/icons/mob/humans/onmob/items_lefthand_1.dmi b/icons/mob/humans/onmob/items_lefthand_1.dmi index e67702c26fa..abd652d1736 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_1.dmi and b/icons/mob/humans/onmob/items_lefthand_1.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_0.dmi b/icons/mob/humans/onmob/items_righthand_0.dmi index 660dd5dc116..073270667cd 100644 Binary files a/icons/mob/humans/onmob/items_righthand_0.dmi and b/icons/mob/humans/onmob/items_righthand_0.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_1.dmi b/icons/mob/humans/onmob/items_righthand_1.dmi index 7514f553373..b46557425e8 100644 Binary files a/icons/mob/humans/onmob/items_righthand_1.dmi and b/icons/mob/humans/onmob/items_righthand_1.dmi differ diff --git a/icons/mob/humans/onmob/suit_0.dmi b/icons/mob/humans/onmob/suit_0.dmi index 4898bd6840d..70558a40a5b 100644 Binary files a/icons/mob/humans/onmob/suit_0.dmi and b/icons/mob/humans/onmob/suit_0.dmi differ diff --git a/icons/mob/humans/onmob/suit_1.dmi b/icons/mob/humans/onmob/suit_1.dmi index 7acc0600646..8688e825414 100644 Binary files a/icons/mob/humans/onmob/suit_1.dmi and b/icons/mob/humans/onmob/suit_1.dmi differ diff --git a/icons/mob/humans/onmob/suit_slot.dmi b/icons/mob/humans/onmob/suit_slot.dmi index 4b6f87c8d34..f625dfcf8de 100644 Binary files a/icons/mob/humans/onmob/suit_slot.dmi and b/icons/mob/humans/onmob/suit_slot.dmi differ diff --git a/icons/mob/humans/onmob/ties.dmi b/icons/mob/humans/onmob/ties.dmi index 556cde33158..fd6a3c47650 100644 Binary files a/icons/mob/humans/onmob/ties.dmi and b/icons/mob/humans/onmob/ties.dmi differ diff --git a/icons/mob/humans/onmob/uniform_0.dmi b/icons/mob/humans/onmob/uniform_0.dmi index 7adcff866d1..1fa418da6ab 100644 Binary files a/icons/mob/humans/onmob/uniform_0.dmi and b/icons/mob/humans/onmob/uniform_0.dmi differ diff --git a/icons/mob/humans/onmob/uniform_1.dmi b/icons/mob/humans/onmob/uniform_1.dmi index 84acb5799ba..1969a1f8c61 100644 Binary files a/icons/mob/humans/onmob/uniform_1.dmi and b/icons/mob/humans/onmob/uniform_1.dmi differ diff --git a/icons/obj/items/clothing/cm_hats.dmi b/icons/obj/items/clothing/cm_hats.dmi index 123de1483bd..74ed35d8073 100644 Binary files a/icons/obj/items/clothing/cm_hats.dmi and b/icons/obj/items/clothing/cm_hats.dmi differ diff --git a/icons/obj/items/clothing/cm_suits.dmi b/icons/obj/items/clothing/cm_suits.dmi index 22d5e299cdc..6a3f51b15f2 100644 Binary files a/icons/obj/items/clothing/cm_suits.dmi and b/icons/obj/items/clothing/cm_suits.dmi differ diff --git a/icons/obj/items/clothing/uniforms.dmi b/icons/obj/items/clothing/uniforms.dmi index 1ba7dfa41de..c9d6dd0e86f 100644 Binary files a/icons/obj/items/clothing/uniforms.dmi and b/icons/obj/items/clothing/uniforms.dmi differ diff --git a/icons/obj/items/helmet_garb.dmi b/icons/obj/items/helmet_garb.dmi index e691f10a351..3bc18105160 100644 Binary files a/icons/obj/items/helmet_garb.dmi and b/icons/obj/items/helmet_garb.dmi differ diff --git a/icons/obj/items/weapons/guns/ammo_boxes/text.dmi b/icons/obj/items/weapons/guns/ammo_boxes/text.dmi index 211b29d27e1..44f9ff79629 100644 Binary files a/icons/obj/items/weapons/guns/ammo_boxes/text.dmi and b/icons/obj/items/weapons/guns/ammo_boxes/text.dmi differ diff --git a/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi b/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi index d21840c42a3..f6669686e56 100644 Binary files a/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi and b/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments.dmi b/icons/obj/items/weapons/guns/attachments.dmi index cfa92383384..b0c8b8d89e3 100644 Binary files a/icons/obj/items/weapons/guns/attachments.dmi and b/icons/obj/items/weapons/guns/attachments.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/stock.dmi b/icons/obj/items/weapons/guns/attachments/stock.dmi index ef8d80a5b26..5aa17ebf645 100644 Binary files a/icons/obj/items/weapons/guns/attachments/stock.dmi and b/icons/obj/items/weapons/guns/attachments/stock.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi b/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi index c46ec35e723..92162f3bf69 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi differ diff --git a/icons/obj/items/weapons/guns/lineart.dmi b/icons/obj/items/weapons/guns/lineart.dmi index eda346cede0..21f10316ba8 100644 Binary files a/icons/obj/items/weapons/guns/lineart.dmi and b/icons/obj/items/weapons/guns/lineart.dmi differ diff --git a/maps/bigredv2.json b/maps/bigredv2.json index 996d0d44422..5114e84d57d 100644 --- a/maps/bigredv2.json +++ b/maps/bigredv2.json @@ -4,20 +4,6 @@ "map_file": "BigRed.dmm", "webmap_url": "Solaris", "weather_holder": "/datum/weather_ss_map_holder/big_red", - "survivor_types": [ - "/datum/equipment_preset/survivor/scientist/solaris", - "/datum/equipment_preset/survivor/doctor/solaris", - "/datum/equipment_preset/survivor/chaplain/solaris", - "/datum/equipment_preset/survivor/engineer/solaris", - "/datum/equipment_preset/survivor/trucker/solaris", - "/datum/equipment_preset/survivor/security/solaris", - "/datum/equipment_preset/survivor/uscm/solaris", - "/datum/equipment_preset/survivor/colonial_marshal/solaris", - "/datum/equipment_preset/survivor/corporate/solaris", - "/datum/equipment_preset/survivor/flight_control_operator", - "/datum/equipment_preset/survivor/clf", - "/datum/equipment_preset/survivor/civilian" - ], "defcon_triggers": [ 4750, 3500, diff --git a/maps/corsat.json b/maps/corsat.json index 934a7e21728..badd1615ba1 100644 --- a/maps/corsat.json +++ b/maps/corsat.json @@ -7,17 +7,6 @@ "COLD": true, "InSpace": true }, - "survivor_types": [ - "/datum/equipment_preset/survivor/scientist/corsat", - "/datum/equipment_preset/survivor/scientist/corsat", - "/datum/equipment_preset/survivor/goon", - "/datum/equipment_preset/survivor/doctor/corsat", - "/datum/equipment_preset/survivor/security/corsat", - "/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison/corsat", - "/datum/equipment_preset/survivor/engineer/corsat", - "/datum/equipment_preset/survivor/clf", - "/datum/equipment_preset/survivor/civilian" - ], "defcon_triggers": [ 3300, 2100, diff --git a/maps/desert_dam.json b/maps/desert_dam.json index b40e9887d15..3307c68d783 100644 --- a/maps/desert_dam.json +++ b/maps/desert_dam.json @@ -3,21 +3,6 @@ "map_path": "map_files/DesertDam", "map_file": "Desert_Dam.dmm", "webmap_url": "Trijent", - "survivor_types": [ - "/datum/equipment_preset/survivor/doctor/trijent", - "/datum/equipment_preset/survivor/scientist/trijent", - "/datum/equipment_preset/survivor/roughneck", - "/datum/equipment_preset/survivor/chaplain/trijent", - "/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison", - "/datum/equipment_preset/survivor/colonial_marshal/trijent", - "/datum/equipment_preset/survivor/engineer/trijent", - "/datum/equipment_preset/survivor/engineer/trijent/hydro", - "/datum/equipment_preset/survivor/trucker/trijent", - "/datum/equipment_preset/survivor/security/trijent", - "/datum/equipment_preset/survivor/corporate/trijent", - "/datum/equipment_preset/survivor/clf", - "/datum/equipment_preset/survivor/civilian" - ], "defcon_triggers": [ 3300, 2100, diff --git a/maps/fiorina_sciannex.json b/maps/fiorina_sciannex.json index 85375dc5eb8..86e3551d15b 100644 --- a/maps/fiorina_sciannex.json +++ b/maps/fiorina_sciannex.json @@ -3,19 +3,6 @@ "map_path": "map_files/FOP_v3_Sciannex", "map_file": "Fiorina_SciAnnex.dmm", "webmap_url": "Fiorina", - "survivor_types": [ - "/datum/equipment_preset/survivor/scientist/fiorina", - "/datum/equipment_preset/survivor/doctor/fiorina", - "/datum/equipment_preset/survivor/interstellar_human_rights_observer", - "/datum/equipment_preset/survivor/security/fiorina", - "/datum/equipment_preset/survivor/colonial_marshal/fiorina", - "/datum/equipment_preset/survivor/prisoner", - "/datum/equipment_preset/survivor/prisoner", - "/datum/equipment_preset/survivor/gangleader", - "/datum/equipment_preset/survivor/engineer/fiorina", - "/datum/equipment_preset/survivor/clf", - "/datum/equipment_preset/survivor/civilian" - ], "defcon_triggers": [ 3750, 2600, diff --git a/maps/ice_colony_v1.json b/maps/ice_colony_v1.json index b81ec35ee01..8ca7412d8f9 100644 --- a/maps/ice_colony_v1.json +++ b/maps/ice_colony_v1.json @@ -6,15 +6,6 @@ "COLD": true }, "weather_holder": "/datum/weather_ss_map_holder/sorokyne", - "survivor_types": [ - "/datum/equipment_preset/survivor/corporate/shiva", - "/datum/equipment_preset/survivor/doctor/shiva", - "/datum/equipment_preset/survivor/scientist/shiva", - "/datum/equipment_preset/survivor/engineer/shiva", - "/datum/equipment_preset/survivor/security/shiva", - "/datum/equipment_preset/survivor/clf/cold", - "/datum/equipment_preset/survivor/civilian" - ], "defcon_triggers": [ 3300, 2100, diff --git a/maps/ice_colony_v2.json b/maps/ice_colony_v2.json index bc618bd8256..09adf0ce13e 100644 --- a/maps/ice_colony_v2.json +++ b/maps/ice_colony_v2.json @@ -5,15 +5,6 @@ "environment_traits": { "COLD": true }, - "survivor_types": [ - "/datum/equipment_preset/survivor/corporate/shiva", - "/datum/equipment_preset/survivor/doctor/shiva", - "/datum/equipment_preset/survivor/scientist/shiva", - "/datum/equipment_preset/survivor/engineer/shiva", - "/datum/equipment_preset/survivor/security/shiva", - "/datum/equipment_preset/survivor/clf", - "/datum/equipment_preset/survivor/civilian" - ], "defcon_triggers": [ 3300, 2100, diff --git a/maps/kutjevo.json b/maps/kutjevo.json index 83a0ff90c57..d39c37c0b58 100644 --- a/maps/kutjevo.json +++ b/maps/kutjevo.json @@ -3,17 +3,6 @@ "map_path": "map_files/Kutjevo", "map_file": "Kutjevo.dmm", "webmap_url": "Kutjevo", - - "survivor_types": [ - "/datum/equipment_preset/survivor/doctor/kutjevo", - "/datum/equipment_preset/survivor/chaplain/kutjevo", - "/datum/equipment_preset/survivor/engineer/kutjevo", - "/datum/equipment_preset/survivor/colonial_marshal/kutjevo", - "/datum/equipment_preset/survivor/trucker/kutjevo", - "/datum/equipment_preset/survivor/security/kutjevo", - "/datum/equipment_preset/survivor/clf", - "/datum/equipment_preset/survivor/civilian" - ], "defcon_triggers": [ 4250, 2950, diff --git a/maps/lv522_chances_claim.json b/maps/lv522_chances_claim.json index 4e050d2aa92..dcaeaa5af5a 100644 --- a/maps/lv522_chances_claim.json +++ b/maps/lv522_chances_claim.json @@ -4,17 +4,7 @@ "map_path": "map_files/LV522_Chances_Claim", "map_file": "LV522_Chances_Claim.dmm", "webmap_url": "LV552", - "weather_holder": "/datum/weather_ss_map_holder/lv522_chances_claim", - "survivor_types": [ - "/datum/equipment_preset/survivor/forecon/standard" - ], - "synth_survivor_types": [ - "/datum/equipment_preset/synth/survivor/forecon" - ], - "CO_survivor_types": [ - "/datum/equipment_preset/survivor/forecon/major" - ], "defcon_triggers": [ 3300, 2100, diff --git a/maps/lv624.json b/maps/lv624.json index 7c782c0a43b..e9b2cb10aa0 100644 --- a/maps/lv624.json +++ b/maps/lv624.json @@ -4,19 +4,6 @@ "map_file": "LV624.dmm", "webmap_url": "LV624", "weather_holder": "/datum/weather_ss_map_holder/lv624", - "survivor_types": [ - "/datum/equipment_preset/survivor/scientist/lv", - "/datum/equipment_preset/survivor/doctor/lv", - "/datum/equipment_preset/survivor/chaplain/lv", - "/datum/equipment_preset/survivor/engineer/lv", - "/datum/equipment_preset/survivor/corporate/lv", - "/datum/equipment_preset/survivor/trucker/lv", - "/datum/equipment_preset/survivor/security/lv", - "/datum/equipment_preset/survivor/colonial_marshal/lv", - "/datum/equipment_preset/survivor/goon", - "/datum/equipment_preset/survivor/clf", - "/datum/equipment_preset/survivor/civilian" - ], "map_item_type": "/obj/item/map/lazarus_landing_map", "announce_text": "An automated distress signal has been received from the archaeological site of Lazarus Landing, on the border world of LV-624. A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "monkey_types": [ diff --git a/maps/lv624_repaired.json b/maps/lv624_repaired.json index 91a15c85a22..87064906c3a 100644 --- a/maps/lv624_repaired.json +++ b/maps/lv624_repaired.json @@ -4,18 +4,6 @@ "map_file": "LV624_repaired.dmm", "webmap_url": "LV624", "weather_holder": "/datum/weather_ss_map_holder/lv624", - "survivor_types": [ - "/datum/equipment_preset/survivor/scientist/lv", - "/datum/equipment_preset/survivor/doctor/lv", - "/datum/equipment_preset/survivor/chaplain/lv", - "/datum/equipment_preset/survivor/engineer/lv", - "/datum/equipment_preset/survivor/corporate", - "/datum/equipment_preset/survivor/trucker/lv", - "/datum/equipment_preset/survivor/security/lv", - "/datum/equipment_preset/survivor/goon", - "/datum/equipment_preset/survivor/clf", - "/datum/equipment_preset/survivor/civilian" - ], "map_item_type": "/obj/item/map/lazarus_landing_map", "announce_text": "An automated distress signal has been received from the archaeologial site of Lazarus Landing, on border world of 'LV-624'. A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "monkey_types": [ diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index 88d99fa46fa..4feca38dfc2 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -196,15 +196,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor, /area/bigredv2/outside/marshal_office) -"adG" = ( -/obj/item/shard, -/obj/effect/decal/cleanable/blood{ - icon_state = "gib6" - }, -/obj/effect/landmark/corpsespawner/security/marshal, -/obj/structure/window_frame/solaris/reinforced, -/turf/open/floor/plating, -/area/bigredv2/outside/marshal_office) "adL" = ( /obj/structure/machinery/light{ dir = 4 @@ -1993,7 +1984,6 @@ /turf/open/floor, /area/bigredv2/outside/hydroponics) "aCq" = ( -/obj/effect/landmark/corpsespawner/scientist, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/engine, /area/bigredv2/caves/lambda/research) @@ -3529,10 +3519,6 @@ }, /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) -"biK" = ( -/obj/effect/landmark/corpsespawner/security/marshal, -/turf/open/floor, -/area/bigredv2/outside/cargo) "biL" = ( /obj/effect/decal/cleanable/dirt, /obj/item/device/megaphone, @@ -5497,10 +5483,6 @@ /obj/item/paper/bigred/smuggling, /turf/open/floor, /area/bigredv2/outside/cargo) -"cJd" = ( -/obj/effect/landmark/corpsespawner/miner, -/turf/open/floor/plating/platingdmg3/west, -/area/bigredv2/caves/mining) "cJe" = ( /turf/open/floor/asteroidfloor/north, /area/bigredv2/outside/eta) @@ -6292,10 +6274,6 @@ }, /turf/open/floor/delivery, /area/bigredv2/caves/lambda/research) -"drH" = ( -/obj/effect/landmark/corpsespawner/engineer, -/turf/open/shuttle/escapepod/floor1, -/area/bigredv2/oob) "drO" = ( /obj/effect/landmark/static_comms/net_two, /turf/open/floor/bcircuit, @@ -6368,10 +6346,6 @@ "dua" = ( /turf/open/mars/mars_dirt_14, /area/bigredv2/outside/eta) -"duo" = ( -/obj/effect/landmark/corpsespawner/colonist/burst, -/turf/open/floor/plating, -/area/bigredv2/caves/mining) "duF" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -6717,7 +6691,6 @@ /area/bigredv2/outside/virology) "dIF" = ( /obj/structure/bed/chair/office/dark, -/obj/effect/landmark/corpsespawner/engineer, /turf/open/floor/dark, /area/bigredv2/outside/engineering) "dIN" = ( @@ -8361,7 +8334,6 @@ /obj/structure/bed/chair{ dir = 8 }, -/obj/effect/landmark/corpsespawner/prisoner, /turf/open/floor/white, /area/bigredv2/outside/marshal_office) "fho" = ( @@ -9355,7 +9327,6 @@ /turf/open/floor/asteroidfloor/north, /area/bigredv2/caves_lambda) "fUS" = ( -/obj/effect/landmark/corpsespawner/security/marshal, /obj/effect/decal/cleanable/blood, /obj/item/weapon/classic_baton, /turf/open/mars_cave/mars_dirt_4, @@ -9457,7 +9428,6 @@ /area/bigredv2/outside/office_complex) "fZX" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/miner, /turf/open/mars_cave/mars_dirt_7, /area/bigredv2/caves/mining) "fZZ" = ( @@ -9868,13 +9838,11 @@ /obj/structure/machinery/light/built{ dir = 1 }, -/obj/effect/landmark/corpsespawner/doctor, /obj/effect/decal/cleanable/blood, /turf/open/floor/whitegreen/northwest, /area/bigredv2/caves/lambda/virology) "grq" = ( /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, -/obj/effect/landmark/corpsespawner/russian, /obj/effect/decal/cleanable/blood/splatter, /turf/open/mars_cave/mars_cave_3, /area/bigredv2/caves/mining) @@ -10277,7 +10245,6 @@ /turf/open/floor/whitebluefull/northeast, /area/bigredv2/outside/general_store) "gHS" = ( -/obj/effect/landmark/corpsespawner/ua_riot, /obj/effect/decal/cleanable/blood/drip{ pixel_y = 6 }, @@ -10422,7 +10389,6 @@ "gMJ" = ( /obj/effect/decal/cleanable/blood/splatter, /obj/item/ore/diamond, -/obj/effect/landmark/corpsespawner/miner, /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) "gNc" = ( @@ -10775,7 +10741,6 @@ /turf/open/floor/dark, /area/bigredv2/outside/filtration_plant) "hca" = ( -/obj/effect/landmark/corpsespawner/miner, /obj/item/tool/pickaxe, /obj/effect/decal/cleanable/blood, /turf/open/mars_cave/mars_cave_2, @@ -11557,10 +11522,6 @@ /obj/structure/surface/table/woodentable/fancy, /turf/open/floor/wood, /area/bigredv2/outside/marshal_office) -"hLp" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/mars_cave, -/area/bigredv2/caves/mining) "hLS" = ( /obj/structure/sign/poster/safety, /turf/closed/wall/wood, @@ -11737,7 +11698,6 @@ pixel_x = 12; pixel_y = 3 }, -/obj/effect/landmark/corpsespawner/miner, /obj/effect/decal/cleanable/blood, /turf/open/mars_cave/mars_cave_13, /area/bigredv2/caves/mining) @@ -11981,7 +11941,6 @@ /obj/effect/decal/cleanable/blood{ layer = 3 }, -/obj/effect/landmark/corpsespawner/ua_riot, /turf/open/mars_cave/mars_cave_2, /area/bigredv2/caves_research) "ieR" = ( @@ -12063,17 +12022,6 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave/mars_cave_5, /area/bigredv2/caves_north) -"iik" = ( -/obj/effect/landmark/corpsespawner/miner, -/obj/effect/decal/cleanable/blood{ - dir = 8; - icon_state = "gib6"; - layer = 4; - pixel_x = 12; - pixel_y = 3 - }, -/turf/open/mars_cave/mars_cave_3, -/area/bigredv2/caves/mining) "iiS" = ( /obj/item/tool/pickaxe, /turf/open/mars_cave/mars_dirt_7, @@ -12469,10 +12417,6 @@ "iAr" = ( /turf/open/mars_cave/mars_dirt_7, /area/bigredv2/outside/s) -"iAw" = ( -/obj/effect/landmark/corpsespawner/scientist, -/turf/open/floor/plating, -/area/bigredv2/caves/lambda/xenobiology) "iAH" = ( /obj/structure/reagent_dispensers/watertank, /obj/structure/machinery/light{ @@ -12728,7 +12672,6 @@ /turf/open/floor/dark, /area/bigredv2/caves/eta/living) "iMR" = ( -/obj/effect/landmark/corpsespawner/security, /obj/effect/decal/cleanable/blood{ layer = 3 }, @@ -13095,11 +13038,6 @@ /obj/structure/closet/l3closet/virology, /turf/open/floor/white, /area/bigredv2/outside/virology) -"jco" = ( -/obj/structure/bed, -/obj/effect/landmark/corpsespawner/pmc, -/turf/open/floor/wood, -/area/bigredv2/caves/eta/research) "jcs" = ( /obj/item/shard{ icon_state = "small" @@ -14272,11 +14210,6 @@ /obj/effect/decal/cleanable/vomit, /turf/open/floor/dark, /area/bigredv2/caves/lambda/breakroom) -"kdu" = ( -/obj/effect/landmark/corpsespawner/scientist, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/floor/dark, -/area/bigredv2/caves/lambda/xenobiology) "keg" = ( /turf/closed/wall/solaris/reinforced, /area/bigredv2/outside/lz2_south_cas) @@ -14658,8 +14591,6 @@ dir = 4; health = 25000 }, -/obj/effect/landmark/corpsespawner/miner, -/obj/effect/landmark/corpsespawner/miner, /obj/effect/decal/cleanable/blood, /obj/item/weapon/twohanded/spear{ pixel_x = 5 @@ -15042,7 +14973,6 @@ /turf/open/mars_cave/mars_dirt_6, /area/bigredv2/outside/virology) "kGL" = ( -/obj/effect/landmark/corpsespawner/miner, /obj/effect/decal/cleanable/blood{ icon_state = "gib6" }, @@ -15868,7 +15798,6 @@ /turf/open/floor/whitepurple, /area/bigredv2/caves/lambda/research) "lmR" = ( -/obj/effect/landmark/corpsespawner/ua_riot, /obj/effect/decal/cleanable/blood{ dir = 8; icon_state = "gib6"; @@ -15990,7 +15919,6 @@ /turf/open/floor/delivery, /area/bigredv2/outside/marshal_office) "lrp" = ( -/obj/effect/landmark/corpsespawner/security/marshal, /obj/effect/decal/cleanable/blood/oil, /obj/item/weapon/gun/launcher/grenade/m81/m79{ pixel_x = -3; @@ -16141,7 +16069,6 @@ /area/bigredv2/outside/n) "lyi" = ( /obj/item/weapon/gun/rifle/m4ra, -/obj/effect/landmark/corpsespawner/ua_riot, /obj/effect/decal/cleanable/blood{ dir = 8; icon_state = "gib6"; @@ -17102,7 +17029,6 @@ /turf/open/mars_cave/mars_cave_5, /area/bigredv2/caves/eta/research) "msh" = ( -/obj/effect/landmark/corpsespawner/ua_riot, /obj/item/weapon/gun/rifle/m41a/training, /obj/effect/spawner/gibspawner/human, /turf/open/mars_cave/mars_cave_2, @@ -17525,7 +17451,6 @@ icon_state = "mirror_broke"; pixel_x = 30 }, -/obj/effect/landmark/corpsespawner/scientist, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/white, /area/bigredv2/caves/lambda/xenobiology) @@ -18040,7 +17965,6 @@ dir = 1 }, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/obj/effect/landmark/corpsespawner/pmc, /turf/open/floor/darkpurple2, /area/bigredv2/caves/lambda/breakroom) "nme" = ( @@ -18667,7 +18591,6 @@ /turf/open/floor/asteroidwarning/north, /area/bigredv2/caves_lambda) "nLc" = ( -/obj/effect/landmark/corpsespawner/miner, /obj/effect/decal/cleanable/blood{ dir = 8; icon_state = "gib6"; @@ -19325,7 +19248,6 @@ /turf/open/floor/plating/plating_catwalk, /area/bigredv2/outside/engineering) "omP" = ( -/obj/effect/landmark/corpsespawner/scientist, /turf/open/floor/darkgreen2/southeast, /area/bigredv2/caves/lambda/virology) "omS" = ( @@ -19750,7 +19672,6 @@ /turf/open/floor/asteroidfloor/north, /area/bigredv2/outside/e) "oFQ" = ( -/obj/effect/landmark/corpsespawner/miner, /obj/effect/decal/cleanable/blood, /turf/open/mars_cave/mars_dirt_4, /area/bigredv2/caves/mining) @@ -20386,7 +20307,6 @@ /area/bigredv2/caves/lambda/xenobiology) "phe" = ( /obj/effect/decal/cleanable/blood/drip, -/obj/effect/landmark/corpsespawner/miner, /obj/item/weapon/gun/rifle/m16{ pixel_x = 10 }, @@ -22036,7 +21956,6 @@ /turf/open/floor/dark, /area/bigredv2/caves/eta/storage) "qGP" = ( -/obj/effect/landmark/corpsespawner/miner, /obj/effect/decal/cleanable/blood/splatter, /turf/open/mars_cave/mars_cave_6, /area/bigredv2/caves/mining) @@ -22086,7 +22005,6 @@ /area/bigredv2/outside/sw) "qJm" = ( /obj/item/weapon/twohanded/folded_metal_chair, -/obj/effect/landmark/corpsespawner/colonist/random/burst, /turf/open/mars_cave/mars_cave_16, /area/bigredv2/caves/mining) "qJz" = ( @@ -23971,7 +23889,6 @@ pixel_y = 3 }, /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/miner, /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) "sts" = ( @@ -24023,17 +23940,6 @@ /obj/effect/landmark/crap_item, /turf/open/floor/whitepurplefull, /area/bigredv2/outside/medical) -"sxI" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/obj/effect/decal/cleanable/blood{ - dir = 8; - icon_state = "gib6"; - layer = 4; - pixel_x = 12; - pixel_y = 3 - }, -/turf/open/mars_cave/mars_dirt_4, -/area/bigredv2/caves_research) "sxK" = ( /obj/structure/machinery/computer/cameras{ dir = 1 @@ -24773,11 +24679,6 @@ }, /turf/open/floor/asteroidwarning/north, /area/bigredv2/outside/nw) -"tcl" = ( -/obj/structure/bed, -/obj/effect/landmark/corpsespawner/scientist, -/turf/open/floor/wood, -/area/bigredv2/caves/eta/living) "tcs" = ( /turf/open/floor/darkpurplecorners2/east, /area/bigredv2/caves/lambda/xenobiology) @@ -25473,7 +25374,6 @@ icon_state = "N" }, /obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpsespawner/security/marshal, /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/mars_cave/mars_dirt_4, /area/bigredv2/caves/mining) @@ -25599,13 +25499,6 @@ }, /turf/open/mars_cave/mars_dirt_6, /area/bigredv2/caves/mining) -"tIl" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/landmark/corpsespawner/doctor, -/turf/open/floor/white, -/area/bigredv2/outside/medical) "tIr" = ( /obj/structure/surface/table, /obj/effect/decal/cleanable/blood/gibs/limb, @@ -25761,7 +25654,6 @@ /area/bigredv2/outside/telecomm/warehouse) "tOL" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/security/marshal, /obj/item/weapon/gun/revolver/spearhead, /turf/open/mars_cave/mars_cave_2, /area/bigredv2/caves/mining) @@ -26541,7 +26433,6 @@ dir = 4; health = 25000 }, -/obj/effect/landmark/corpsespawner/miner, /obj/effect/decal/cleanable/blood{ icon_state = "gib6" }, @@ -27445,7 +27336,6 @@ pixel_x = 5 }, /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/miner, /turf/open/mars_cave/mars_dirt_4, /area/bigredv2/caves/mining) "vmV" = ( @@ -29709,7 +29599,6 @@ /turf/open/floor/white, /area/bigredv2/outside/medical) "xdX" = ( -/obj/effect/landmark/corpsespawner/ua_riot, /obj/item/weapon/baton/loaded, /obj/item/weapon/twohanded/spear{ pixel_x = -16; @@ -29758,7 +29647,6 @@ /turf/open/floor/whitegreenfull, /area/bigredv2/outside/hydroponics) "xfw" = ( -/obj/effect/landmark/corpsespawner/miner, /obj/effect/decal/cleanable/blood{ dir = 4; icon_state = "gib6" @@ -35165,7 +35053,7 @@ jUY jUY jUY dHr -hLp +jUY vKr vHw aao @@ -36482,7 +36370,7 @@ wfd gFh qPg ffg -cJd +qLD vrl jkr uHQ @@ -37323,7 +37211,7 @@ aao uHQ dtY wtj -duo +wtj wtj wtj iAi @@ -42695,7 +42583,7 @@ jxt bbe bhE bbR -biK +aZu xRw qmz atA @@ -43409,7 +43297,7 @@ aao aao rIl dww -drH +dww sRl wjc rSF @@ -46235,7 +46123,7 @@ aao aao ncf qHI -iik +cjd lqG nsZ xJO @@ -48212,7 +48100,7 @@ tZG otn dUe wGa -sxI +nFt tZG aao aao @@ -48729,7 +48617,7 @@ maX amj vNC rdk -tIl +tXH cwg rWq amj @@ -52378,7 +52266,7 @@ acP acP acP jGz -adG +acs hhf brQ lLZ @@ -56018,7 +55906,7 @@ aDX xfy jaL jaL -tcl +tfy aDX eqo wRZ @@ -56417,7 +56305,7 @@ aao aBv jaP gEa -jco +jaP aBA rrm vFz @@ -68231,7 +68119,7 @@ koQ adZ aev aev -iAw +aev aev aev amH @@ -71266,7 +71154,7 @@ aao adZ adZ tcs -kdu +vJV sTc cew mRP diff --git a/maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm b/maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm index 7f8a0f8d924..d9292c827f6 100644 --- a/maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm +++ b/maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm @@ -146,7 +146,6 @@ /turf/open/floor/dark, /area/bigredv2/outside/marshal_office) "dM" = ( -/obj/effect/landmark/corpsespawner/prisoner, /obj/effect/decal/cleanable/blood, /turf/open/floor/redcorner, /area/bigredv2/outside/marshal_office) @@ -238,7 +237,6 @@ /area/bigredv2/outside/marshal_office) "lw" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/corpsespawner/prison_security, /obj/effect/decal/cleanable/blood, /obj/item/ammo_casing/shell, /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, @@ -620,7 +618,6 @@ /area/bigredv2/outside/marshal_office) "KI" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/corpsespawner/prisoner, /obj/effect/decal/cleanable/blood, /obj/item/tool/screwdriver, /turf/open/floor/dark, @@ -629,7 +626,6 @@ /obj/structure/bed/chair{ dir = 8 }, -/obj/effect/landmark/corpsespawner/prisoner, /turf/open/floor/white, /area/bigredv2/outside/marshal_office) "Ly" = ( @@ -723,7 +719,6 @@ /turf/open/floor/whitegreenfull/northeast, /area/bigredv2/outside/marshal_office) "Rh" = ( -/obj/effect/landmark/corpsespawner/prisoner, /obj/effect/decal/cleanable/blood, /turf/open/floor/dark, /area/bigredv2/outside/marshal_office) @@ -777,7 +772,6 @@ /area/bigredv2/outside/marshal_office) "To" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/corpsespawner/prisoner, /obj/effect/decal/cleanable/blood, /obj/item/tool/kitchen/knife, /turf/open/floor/redcorner, @@ -845,11 +839,6 @@ }, /turf/open/floor/dark, /area/bigredv2/outside/marshal_office) -"Vp" = ( -/obj/effect/landmark/corpsespawner/prison_security, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/dark, -/area/bigredv2/outside/marshal_office) "Vv" = ( /obj/structure/machinery/light, /turf/open/floor/bcircuit, @@ -1415,7 +1404,7 @@ uK Mx ah Xg -Vp +Rh ih tk ah diff --git a/maps/map_files/BigRed/sprinkles/20.etatunnel_open.dmm b/maps/map_files/BigRed/sprinkles/20.etatunnel_open.dmm index 9ae1d2f7134..9e0ea0a0ece 100644 --- a/maps/map_files/BigRed/sprinkles/20.etatunnel_open.dmm +++ b/maps/map_files/BigRed/sprinkles/20.etatunnel_open.dmm @@ -206,7 +206,6 @@ /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) "Ch" = ( -/obj/effect/landmark/corpsespawner/ua_riot, /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) @@ -299,7 +298,6 @@ /obj/structure/bed/chair{ dir = 8 }, -/obj/effect/landmark/corpsespawner/security, /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) diff --git a/maps/map_files/BigRed/sprinkles/20.lz1entrance_v2.dmm b/maps/map_files/BigRed/sprinkles/20.lz1entrance_v2.dmm index 729d541cbc9..ad90ee0bc60 100644 --- a/maps/map_files/BigRed/sprinkles/20.lz1entrance_v2.dmm +++ b/maps/map_files/BigRed/sprinkles/20.lz1entrance_v2.dmm @@ -447,11 +447,6 @@ "cb" = ( /turf/open/mars/mars_dirt_14, /area/bigredv2/outside/nw) -"cc" = ( -/obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/engineer, -/turf/open/floor/dark, -/area/bigredv2/outside/space_port) "Dc" = ( /obj/effect/decal/cleanable/dirt, /turf/template_noop, @@ -797,7 +792,7 @@ bl ai aq aA -cc +aK aw bc ai diff --git a/maps/map_files/BigRed/sprinkles/25.vault_v2.dmm b/maps/map_files/BigRed/sprinkles/25.vault_v2.dmm index 5c1c05d3e25..5668c21f2ec 100644 --- a/maps/map_files/BigRed/sprinkles/25.vault_v2.dmm +++ b/maps/map_files/BigRed/sprinkles/25.vault_v2.dmm @@ -72,7 +72,6 @@ name = "Observation Shutters"; pixel_y = 28 }, -/obj/effect/landmark/corpsespawner/pmc, /obj/effect/decal/cleanable/vomit, /turf/open/floor/darkpurplecorners2, /area/bigredv2/caves/lambda/breakroom) diff --git a/maps/map_files/BigRed/sprinkles/30.cargo_containers.dmm b/maps/map_files/BigRed/sprinkles/30.cargo_containers.dmm index 8425f2fd690..2a02ee2a8ed 100644 --- a/maps/map_files/BigRed/sprinkles/30.cargo_containers.dmm +++ b/maps/map_files/BigRed/sprinkles/30.cargo_containers.dmm @@ -558,10 +558,6 @@ }, /turf/open/floor, /area/bigredv2/outside/cargo) -"Mr" = ( -/obj/effect/landmark/corpsespawner/security/marshal, -/turf/open/floor, -/area/bigredv2/outside/cargo) "Oc" = ( /obj/structure/machinery/light{ dir = 8 @@ -765,7 +761,7 @@ wt ad Wf bp -Mr +av Ja DM ak diff --git a/maps/map_files/BigRed/sprinkles/40.admin_pmc.dmm b/maps/map_files/BigRed/sprinkles/40.admin_pmc.dmm index 28aa216c59d..8943cdcf743 100644 --- a/maps/map_files/BigRed/sprinkles/40.admin_pmc.dmm +++ b/maps/map_files/BigRed/sprinkles/40.admin_pmc.dmm @@ -31,10 +31,6 @@ /obj/structure/bed/chair/comfy/black, /turf/open/floor/carpet, /area/bigredv2/outside/admin_building) -"au" = ( -/obj/effect/landmark/corpsespawner/wygoon, -/turf/open/floor/carpet, -/area/bigredv2/outside/admin_building) "aB" = ( /obj/structure/surface/table, /obj/structure/prop/server_equipment/laptop/on, @@ -100,7 +96,6 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/obj/effect/landmark/corpsespawner/wygoon, /turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "bc" = ( @@ -137,10 +132,6 @@ /obj/item/storage/toolbox/syndicate, /turf/open/floor/darkred2/east, /area/bigredv2/outside/admin_building) -"fR" = ( -/obj/effect/landmark/corpsespawner/wygoon, -/turf/open/floor/wood, -/area/bigredv2/outside/admin_building) "gb" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/dark, @@ -473,7 +464,7 @@ ab Jy aD Od -fR +WP as WP Li @@ -520,7 +511,7 @@ WP (6,1,1) = {" NX jH -au +aQ aW aL aS diff --git a/maps/map_files/BigRed/sprinkles/40.dorms_party.dmm b/maps/map_files/BigRed/sprinkles/40.dorms_party.dmm index 38b92227e1f..4a54b3d5bee 100644 --- a/maps/map_files/BigRed/sprinkles/40.dorms_party.dmm +++ b/maps/map_files/BigRed/sprinkles/40.dorms_party.dmm @@ -37,7 +37,6 @@ /area/bigredv2/outside/dorms) "ai" = ( /obj/item/reagent_container/food/drinks/bottle/absinthe, -/obj/effect/landmark/corpsespawner/colonist/random, /obj/effect/decal/cleanable/blood, /turf/open/floor, /area/bigredv2/outside/dorms) @@ -121,7 +120,6 @@ /obj/effect/decal/cleanable/blood{ icon_state = "xgib4" }, -/obj/effect/landmark/corpsespawner/colonist/random, /turf/open/floor/grimy, /area/bigredv2/outside/dorms) "aB" = ( @@ -138,10 +136,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor, /area/bigredv2/outside/dorms) -"aD" = ( -/obj/effect/landmark/corpsespawner/colonist/random, -/turf/open/floor, -/area/bigredv2/outside/dorms) "aE" = ( /obj/structure/bed/chair{ dir = 4 @@ -373,17 +367,10 @@ /area/bigredv2/outside/dorms) "do" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/corpsespawner/colonist/random, /obj/effect/decal/cleanable/blood, /turf/open/floor/grimy, /area/bigredv2/outside/dorms) -"el" = ( -/obj/effect/landmark/corpsespawner/colonist/random, -/obj/effect/decal/cleanable/blood, -/turf/open/floor, -/area/bigredv2/outside/dorms) "iE" = ( -/obj/effect/landmark/corpsespawner/colonist/random, /obj/effect/decal/cleanable/blood, /obj/structure/machinery/camera/autoname, /turf/open/floor, @@ -396,7 +383,6 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/obj/effect/landmark/corpsespawner/colonist/random, /obj/effect/decal/cleanable/blood, /turf/open/floor, /area/bigredv2/outside/dorms) @@ -446,7 +432,7 @@ ad ad ad ad -aD +ad ad bf "} @@ -478,7 +464,7 @@ aY bi "} (9,1,1) = {" -el +XP aj au aG @@ -544,7 +530,7 @@ aq ad an az -aD +ad aT aK bn diff --git a/maps/map_files/BigRed/standalone/crashlanding-eva.dmm b/maps/map_files/BigRed/standalone/crashlanding-eva.dmm index 03c8267e0a2..e8543a5a93b 100644 --- a/maps/map_files/BigRed/standalone/crashlanding-eva.dmm +++ b/maps/map_files/BigRed/standalone/crashlanding-eva.dmm @@ -406,11 +406,6 @@ }, /turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/hydroponics) -"qW" = ( -/obj/structure/bed/chair/dropship/passenger, -/obj/effect/landmark/corpsespawner/wygoon, -/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, -/area/bigredv2/outside/general_offices) "rh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/oil, @@ -625,7 +620,6 @@ /area/bigredv2/outside/general_offices) "HT" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/wygoon, /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, /area/bigredv2/outside/general_offices) "JK" = ( @@ -660,10 +654,6 @@ }, /turf/open/floor/plating/panelscorched, /area/bigredv2/outside/ne) -"LQ" = ( -/obj/effect/landmark/corpsespawner/wygoon, -/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, -/area/bigredv2/outside/general_offices) "Mp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/dark, @@ -1363,7 +1353,7 @@ TX Xc Xc Xc -qW +Xc Xc pL ZH @@ -1422,7 +1412,7 @@ aQ an aG fQ -LQ +qc Et Et Et diff --git a/maps/map_files/BigRed/standalone/crashlanding-offices.dmm b/maps/map_files/BigRed/standalone/crashlanding-offices.dmm index 7ed7f0e422e..a3070110d4a 100644 --- a/maps/map_files/BigRed/standalone/crashlanding-offices.dmm +++ b/maps/map_files/BigRed/standalone/crashlanding-offices.dmm @@ -281,7 +281,6 @@ /obj/item/weapon/gun/pistol/m4a3/training{ name = "dented M4A3 service pistol" }, -/obj/effect/landmark/corpsespawner/wygoon, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/office_complex) "eG" = ( @@ -417,14 +416,6 @@ /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/office_complex) -"ld" = ( -/obj/structure/bed/chair/dropship/passenger{ - dir = 8 - }, -/obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/wygoon, -/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, -/area/bigredv2/outside/office_complex) "lo" = ( /obj/structure/bed/chair/dropship/passenger{ dir = 8 @@ -649,7 +640,6 @@ /area/bigredv2/outside/se) "wF" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/wygoon, /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_left_to_right, /area/bigredv2/outside/office_complex) "wL" = ( @@ -1169,7 +1159,6 @@ /area/bigredv2/outside/office_complex) "XG" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/pmc, /obj/item/weapon/gun/rifle/nsg23/no_lock, /turf/open/shuttle/dropship/light_grey_single_wide_up_to_down, /area/bigredv2/outside/office_complex) @@ -1709,7 +1698,7 @@ Ci Ir aN kB -ld +Nt zy QF Oz diff --git a/maps/map_files/BigRed/standalone/lambda-graveyard.dmm b/maps/map_files/BigRed/standalone/lambda-graveyard.dmm index 47964ff5ea7..f76338a049c 100644 --- a/maps/map_files/BigRed/standalone/lambda-graveyard.dmm +++ b/maps/map_files/BigRed/standalone/lambda-graveyard.dmm @@ -36,7 +36,6 @@ }, /obj/item/weapon/gun/revolver/small, /obj/item/reagent_container/food/drinks/bottle/rum, -/obj/effect/landmark/corpsespawner/colonist/random, /turf/open/mars, /area/bigredv2/outside/se) "l" = ( diff --git a/maps/map_files/BigRed/standalone/medbay-v3.dmm b/maps/map_files/BigRed/standalone/medbay-v3.dmm index ba25d610fda..1a8dc52ca2d 100644 --- a/maps/map_files/BigRed/standalone/medbay-v3.dmm +++ b/maps/map_files/BigRed/standalone/medbay-v3.dmm @@ -108,7 +108,6 @@ "hv" = ( /obj/effect/decal/cleanable/blood, /obj/structure/pipes/standard/simple/hidden/green, -/obj/effect/landmark/corpsespawner/wygoon, /turf/open/floor/damaged5/west, /area/bigredv2/outside/medical) "hA" = ( @@ -126,7 +125,6 @@ "hQ" = ( /obj/structure/machinery/optable, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/corpsespawner/wygoon, /obj/item/reagent_container/food/snacks/margheritaslice, /turf/open/floor/white, /area/bigredv2/outside/medical) @@ -230,7 +228,6 @@ /area/bigredv2/outside/medical) "lk" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/wygoon, /turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/medical) "lD" = ( @@ -484,13 +481,6 @@ /obj/item/ammo_casing/bullet, /turf/open/floor/platingdmg1, /area/bigredv2/outside/medical) -"ur" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/landmark/corpsespawner/doctor, -/turf/open/floor/white, -/area/bigredv2/outside/medical) "uv" = ( /obj/structure/machinery/light, /turf/open/floor/asteroidwarning/north, @@ -508,7 +498,6 @@ "vg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/wygoon, /turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/medical) "vr" = ( @@ -658,12 +647,6 @@ /obj/item/stack/sheet/metal, /turf/open/floor/platingdmg1, /area/bigredv2/outside/medical) -"yZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/wygoon, -/turf/open/floor/platingdmg1, -/area/bigredv2/outside/medical) "zQ" = ( /obj/effect/decal/cleanable/dirt, /obj/item/ammo_casing/shell, @@ -807,11 +790,6 @@ /obj/effect/landmark/crap_item, /turf/open/floor/platingdmg1, /area/bigredv2/outside/medical) -"Go" = ( -/obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/wygoon, -/turf/open/floor/platingdmg1, -/area/bigredv2/outside/medical) "Gr" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -1112,11 +1090,6 @@ /obj/item/device/healthanalyzer, /turf/open/floor/whitegreenfull, /area/bigredv2/outside/medical) -"PH" = ( -/obj/effect/landmark/corpsespawner/doctor, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/white, -/area/bigredv2/outside/medical) "Qc" = ( /obj/structure/closet/secure_closet/medical2, /turf/open/floor/whitebluefull/northeast, @@ -1127,7 +1100,6 @@ }, /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/corpsespawner/wygoon, /turf/open/floor/platingdmg1, /area/bigredv2/outside/medical) "Qn" = ( @@ -1576,7 +1548,7 @@ GH aj hA Fb -PH +Re JC Iv aa @@ -1784,7 +1756,7 @@ yH Mf Of Ma -Go +xT BO xT BO @@ -2016,7 +1988,7 @@ oE BY RR CP -yZ +BY Dh Re Us @@ -2163,7 +2135,7 @@ nt sQ qd ND -ur +Gr WW Xy ap diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index d3f429217f1..cd3e538ec1e 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -1840,10 +1840,6 @@ }, /turf/open/floor/corsat/marked, /area/corsat/omega/airlocknorth) -"auU" = ( -/obj/effect/landmark/corpsespawner/engineer, -/turf/open/floor/corsat, -/area/corsat/sigma/southeast/generator) "auW" = ( /obj/structure/machinery/power/smes, /turf/open/floor/corsat, @@ -5360,11 +5356,6 @@ }, /turf/open/floor/corsat/tan/north, /area/corsat/sigma/dorms) -"cgb" = ( -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpsespawner/engineer, -/turf/open/floor/corsat/squares, -/area/corsat/sigma/south/robotics) "cgg" = ( /obj/structure/machinery/camera/autoname{ dir = 8; @@ -7148,11 +7139,6 @@ }, /turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) -"ddm" = ( -/obj/effect/landmark/corpsespawner/scientist, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/retrosquareslight, -/area/corsat/gamma/biodome/complex) "ddr" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/corsat/redcorner/north, @@ -7758,7 +7744,6 @@ /area/corsat/omega/hallways) "duD" = ( /obj/structure/pipes/standard/simple/hidden/green, -/obj/effect/landmark/corpsespawner/scientist, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/corsat/white/west, /area/corsat/gamma/residential/east) @@ -8820,11 +8805,6 @@ /obj/effect/landmark/hunter_primary, /turf/open/floor/wood, /area/corsat/sigma/dorms) -"eaO" = ( -/obj/structure/bed/nest, -/obj/effect/landmark/corpsespawner/scientist, -/turf/open/floor/corsat/plate, -/area/corsat/omega/biodome) "eaY" = ( /obj/structure/surface/table/reinforced, /obj/structure/machinery/computer/station_alert, @@ -8837,7 +8817,6 @@ /area/corsat/sigma/south/offices) "ebg" = ( /obj/effect/decal/cleanable/blood/xeno, -/obj/effect/landmark/corpsespawner/wysec, /turf/open/floor/corsat/red/north, /area/corsat/sigma/hangar/security) "ebj" = ( @@ -8931,11 +8910,6 @@ }, /turf/open/gm/dirt, /area/corsat/theta/biodome) -"edg" = ( -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpsespawner/scientist, -/turf/open/floor/corsat/retrosquares, -/area/corsat/gamma/hallwaysouth) "edh" = ( /obj/structure/surface/rack, /obj/item/device/assembly/signaller, @@ -9265,14 +9239,6 @@ }, /turf/open/gm/dirt, /area/corsat/theta/biodome) -"elS" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/landmark/corpsespawner/scientist, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/retrosquares, -/area/corsat/sigma/hangar/monorail) "emg" = ( /turf/open/floor/corsat/plate, /area/corsat/gamma/hangar/checkpoint) @@ -9530,11 +9496,6 @@ }, /turf/open/floor/corsat/retrosquareslight, /area/corsat/omega/complex) -"eru" = ( -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpsespawner/scientist, -/turf/open/floor/corsat/retrosquares, -/area/corsat/gamma/residential) "erK" = ( /obj/structure/surface/table/almayer, /obj/item/tool/surgery/scalpel, @@ -9556,7 +9517,6 @@ /turf/open/floor/corsat/sterileplate, /area/corsat/gamma/kitchen) "esG" = ( -/obj/effect/landmark/corpsespawner/scientist, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/corsat/plate, /area/corsat/sigma/south/complex) @@ -9806,11 +9766,6 @@ /obj/structure/bed/chair/office/light, /turf/open/floor/corsat/whitetan/east, /area/corsat/gamma/residential/west) -"ezu" = ( -/obj/effect/landmark/corpsespawner/doctor, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/retrosquareslight, -/area/corsat/gamma/medbay) "ezv" = ( /obj/structure/machinery/light, /turf/open/floor/corsat/yellowcorner/west, @@ -10689,11 +10644,6 @@ /obj/item/storage/pouch/pistol, /turf/open/floor/corsat/red/north, /area/corsat/omega/control) -"eZp" = ( -/obj/structure/bed/nest, -/obj/effect/landmark/corpsespawner/pmc, -/turf/open/floor/corsat/plate, -/area/corsat/omega/biodome) "eZK" = ( /obj/structure/machinery/door/poddoor/almayer{ id = "SigmaCargo"; @@ -11769,10 +11719,6 @@ }, /turf/open/floor/asteroidwarning, /area/corsat/sigma/biodome/gunrange) -"fCq" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/corsat/red/west, -/area/corsat/gamma/security/cells) "fCE" = ( /obj/structure/machinery/light{ dir = 8 @@ -11874,7 +11820,6 @@ /turf/open/floor/corsat/yellowcorner/west, /area/corsat/sigma/south/engineering) "fFa" = ( -/obj/effect/landmark/corpsespawner/scientist, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/wood, /area/corsat/gamma/residential/researcher) @@ -12320,7 +12265,6 @@ /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "fSH" = ( -/obj/effect/landmark/corpsespawner/engineer, /obj/effect/decal/cleanable/blood/splatter, /obj/structure/pipes/vents/pump, /turf/open/floor/corsat/squares, @@ -12625,11 +12569,6 @@ }, /turf/open/floor/corsat/officesquares, /area/corsat/gamma/airlock/north) -"gbg" = ( -/obj/structure/bed/nest, -/obj/effect/landmark/corpsespawner/engineer, -/turf/open/mars_cave/mars_cave_2, -/area/corsat/sigma/biodome) "gbp" = ( /obj/structure/surface/table, /obj/item/book, @@ -13443,7 +13382,6 @@ /turf/open/floor/corsat/purple/north, /area/corsat/omega/hallways) "gxz" = ( -/obj/effect/landmark/corpsespawner/engineer, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/corsat/yellow/west, /area/corsat/sigma/south/engineering) @@ -16850,11 +16788,6 @@ "imo" = ( /turf/open/floor/corsat/arrow_west, /area/corsat/sigma/south/robotics) -"ims" = ( -/obj/structure/bed/nest, -/obj/effect/landmark/corpsespawner/scientist, -/turf/open/ice, -/area/corsat/gamma/biodome) "imz" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, @@ -16878,11 +16811,6 @@ }, /turf/open/floor/corsat/whitetan/east, /area/corsat/sigma/dorms) -"inf" = ( -/obj/effect/landmark/corpsespawner/pmc, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/officesquares, -/area/corsat/gamma/administration) "ink" = ( /turf/open/floor/corsat/whitecorner, /area/corsat/gamma/residential) @@ -17447,7 +17375,6 @@ /turf/open/floor/corsat/yellowcorner/north, /area/corsat/sigma/airlock/control) "iCl" = ( -/obj/effect/landmark/corpsespawner/wysec, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/corsat/squares, /area/corsat/gamma/security) @@ -17546,11 +17473,6 @@ }, /turf/open/floor/corsat/red/north, /area/corsat/sigma/hangar/security) -"iEZ" = ( -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpsespawner/scientist, -/turf/open/floor/corsat/retrosquares, -/area/corsat/gamma/hangar/arrivals) "iFb" = ( /obj/structure/machinery/light{ dir = 4 @@ -17907,11 +17829,6 @@ "iNf" = ( /turf/open/floor/corsat/brown, /area/corsat/gamma/cargo) -"iNj" = ( -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpsespawner/scientist, -/turf/open/shuttle/dropship/light_grey_single_wide_left_to_right, -/area/corsat/gamma/hangar/monorail/railcart) "iNk" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, /turf/open/gm/dirtgrassborder/east, @@ -18044,13 +17961,11 @@ /turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "iQJ" = ( -/obj/effect/landmark/corpsespawner/doctor, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/corsat/lightplate, /area/corsat/gamma/medbay/surgery) "iQZ" = ( /obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpsespawner/engineer, /turf/open/floor/corsat/yellow/north, /area/corsat/gamma/hallwaysouth) "iRe" = ( @@ -18820,7 +18735,6 @@ /turf/open/floor/corsat/officesquares, /area/corsat/sigma/airlock/south) "jkt" = ( -/obj/effect/landmark/corpsespawner/scientist, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/corsat/retrosquareslight, /area/corsat/sigma/south/complex) @@ -19222,11 +19136,6 @@ }, /turf/open/floor/corsat/yellow/west, /area/corsat/gamma/engineering/atmos) -"jxg" = ( -/obj/effect/landmark/corpsespawner/scientist, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/tan/north, -/area/corsat/gamma/residential/west) "jxC" = ( /obj/structure/machinery/light, /turf/open/floor/corsat/brown, @@ -20331,11 +20240,6 @@ /obj/structure/flora/bush/ausbushes/ppflowers, /turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) -"keH" = ( -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpsespawner/pmc, -/turf/open/floor/corsat/retrosquares, -/area/corsat/gamma/hallwaysouth) "keY" = ( /obj/structure/window/reinforced{ dir = 4; @@ -20602,11 +20506,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/yellowcorner/north, /area/corsat/omega/control) -"klV" = ( -/obj/structure/bed/nest, -/obj/effect/landmark/corpsespawner/engineer, -/turf/open/floor/corsat/plate, -/area/corsat/omega/biodome) "klY" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/glass{ @@ -21019,10 +20918,6 @@ }, /turf/open/floor/corsat/bluegrey/east, /area/corsat/gamma/administration) -"kwt" = ( -/obj/effect/landmark/corpsespawner/pmc, -/turf/open/shuttle/dropship/light_grey_single_wide_left_to_right, -/area/prison/hangar_storage/research/shuttle) "kwz" = ( /turf/open/floor/corsat/plate, /area/corsat/gamma/hangar/cargo) @@ -21377,7 +21272,6 @@ /turf/open/floor/corsat/yellowcorner, /area/corsat/sigma/north) "kHe" = ( -/obj/effect/landmark/corpsespawner/scientist, /obj/effect/decal/cleanable/blood, /turf/open/floor/wood, /area/corsat/gamma/residential/lounge) @@ -21792,14 +21686,6 @@ }, /turf/open/floor/corsat/squareswood/north, /area/corsat/sigma/cafe) -"kRI" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/landmark/corpsespawner/scientist, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/retrosquares, -/area/corsat/gamma/rnr) "kRV" = ( /turf/open/floor/corsat/red/east, /area/corsat/sigma/hangar/id) @@ -21969,12 +21855,6 @@ "kWq" = ( /turf/open/floor/corsat/bluegrey/northeast, /area/corsat/omega/offices) -"kWs" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpsespawner/doctor, -/turf/open/floor/corsat/retrosquareslight, -/area/corsat/gamma/medbay/lobby) "kWw" = ( /turf/open/floor/corsat/redcorner/west, /area/corsat/sigma/hangar/monorail/control) @@ -22833,7 +22713,6 @@ dir = 8 }, /obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpsespawner/scientist, /turf/open/floor/corsat/whitebluefull/southwest, /area/corsat/gamma/residential/lavatory) "lvw" = ( @@ -23357,10 +23236,6 @@ /obj/structure/flora/pottedplant, /turf/open/floor/corsat/spiralplate, /area/corsat/omega/offices) -"lKg" = ( -/obj/effect/landmark/corpsespawner/pmc, -/turf/open/floor/corsat/squares, -/area/corsat/omega/checkpoint) "lKl" = ( /obj/structure/filingcabinet/filingcabinet, /obj/structure/machinery/light{ @@ -23699,11 +23574,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/corsat/yellow/west, /area/corsat/sigma/south/engineering) -"lUd" = ( -/obj/effect/landmark/corpsespawner/wysec, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/squares, -/area/corsat/sigma/checkpoint) "lUp" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -24257,11 +24127,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/squares, /area/corsat/omega/checkpoint) -"miu" = ( -/obj/effect/landmark/corpsespawner/scientist, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/bluegrey/west, -/area/corsat/sigma/south/offices) "miH" = ( /obj/item/storage/box/masks, /obj/structure/surface/rack, @@ -25467,10 +25332,6 @@ /obj/item/storage/fancy/vials/random, /turf/open/floor/corsat/purplewhite/southeast, /area/corsat/theta/biodome/complex) -"mSS" = ( -/obj/effect/landmark/corpsespawner/pmc, -/turf/open/floor/corsat/plate, -/area/corsat/gamma/airlock/south) "mST" = ( /turf/open/floor/corsat/purplewhite/west, /area/corsat/theta/biodome/complex) @@ -26087,11 +25948,6 @@ /obj/structure/machinery/light, /turf/open/floor/corsat/red, /area/corsat/omega/hangar/security) -"njA" = ( -/obj/structure/bed/nest, -/obj/effect/landmark/corpsespawner/scientist, -/turf/open/mars_cave/mars_cave_2, -/area/corsat/sigma/biodome) "njB" = ( /obj/structure/surface/rack, /obj/item/evidencebag, @@ -26322,11 +26178,6 @@ "npa" = ( /turf/open/floor/asteroidwarning, /area/corsat/sigma/biodome) -"npb" = ( -/obj/effect/landmark/corpsespawner/engineer, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/squares, -/area/corsat/sigma/south/robotics) "npe" = ( /turf/open/shuttle/dropship/light_grey_top_right, /area/prison/hangar_storage/research/shuttle) @@ -27895,11 +27746,6 @@ }, /turf/open/floor/corsat/lightplate, /area/corsat/omega/complex) -"oeE" = ( -/obj/effect/landmark/corpsespawner/pmc, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/asteroidfloor/north, -/area/corsat/sigma/biodome/gunrange) "oeF" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -29314,10 +29160,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/squares, /area/corsat/omega/checkpoint) -"oRv" = ( -/obj/effect/landmark/corpsespawner/pmc, -/turf/open/shuttle/dropship/light_grey_single_wide_up_to_down, -/area/prison/hangar_storage/research/shuttle) "oRx" = ( /obj/structure/machinery/light, /turf/open/floor/corsat/red, @@ -29674,11 +29516,6 @@ "oZP" = ( /turf/open/floor/corsat/redcorner/east, /area/corsat/omega/hallways) -"oZT" = ( -/obj/effect/landmark/corpsespawner/scientist, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/squares, -/area/corsat/sigma/southeast/datalab) "oZW" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, @@ -29689,11 +29526,6 @@ }, /turf/open/floor/corsat/officesquares, /area/corsat/gamma/hangar/office) -"paa" = ( -/obj/effect/landmark/corpsespawner/scientist, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/retrosquares, -/area/corsat/gamma/hangar/arrivals) "paf" = ( /obj/effect/landmark/teleporter_loc/corsat_sigma_local{ index = "6" @@ -30741,7 +30573,6 @@ /turf/open/floor/asteroidfloor/north, /area/corsat/sigma/biodome) "pCE" = ( -/obj/effect/landmark/corpsespawner/prisoner, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/corsat/plate, /area/corsat/sigma/south/security) @@ -31512,11 +31343,6 @@ }, /turf/open/floor/corsat/marked, /area/corsat/sigma/hangar/monorail) -"pXp" = ( -/obj/effect/landmark/corpsespawner/scientist, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/wood, -/area/corsat/gamma/residential/east) "pXv" = ( /turf/open/floor/corsat/blue/west, /area/corsat/sigma/southeast) @@ -31710,11 +31536,6 @@ /obj/structure/machinery/vending/snack, /turf/open/floor/corsat/plate, /area/corsat/sigma/south) -"qbL" = ( -/obj/effect/landmark/corpsespawner/scientist, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/tan/north, -/area/corsat/sigma/dorms) "qbV" = ( /obj/structure/window/framed/corsat/security, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -32554,10 +32375,6 @@ /obj/structure/bed/chair/office/light, /turf/open/floor/corsat/squares, /area/corsat/sigma/south/engineering) -"qzz" = ( -/obj/effect/landmark/corpsespawner/scientist, -/turf/open/floor/corsat/darkgreen/west, -/area/corsat/sigma/hangar/monorail) "qzB" = ( /turf/open/floor/plating/warnplate, /area/corsat/omega/hangar) @@ -32739,11 +32556,6 @@ "qFx" = ( /turf/open/floor/corsat/plate, /area/corsat/gamma/hangar/security) -"qFB" = ( -/obj/effect/landmark/corpsespawner/scientist, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/retrosquares, -/area/corsat/sigma/hangar/monorail) "qFD" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 @@ -32818,14 +32630,6 @@ }, /turf/open/floor/corsat/squares, /area/corsat/gamma/engineering/lobby) -"qHA" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpsespawner/engineer, -/turf/open/floor/corsat/retrosquares, -/area/corsat/gamma/residential) "qHD" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/powercell, @@ -33824,7 +33628,6 @@ /turf/open/floor/plating/warnplate/west, /area/corsat/sigma/hangar) "riM" = ( -/obj/effect/landmark/corpsespawner/pmc, /turf/open/floor/corsat/squares, /area/corsat/theta/airlock/west) "riO" = ( @@ -34435,11 +34238,6 @@ /obj/item/pamphlet/skill/powerloader, /turf/open/floor/corsat/plate, /area/corsat/sigma/cargo) -"rzV" = ( -/obj/effect/landmark/corpsespawner/scientist, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/retrosquares, -/area/corsat/gamma/hangar/monorail) "rAi" = ( /obj/structure/sign/safety/airlock{ pixel_y = -32 @@ -35830,7 +35628,6 @@ "smq" = ( /obj/structure/bed, /obj/item/bedsheet, -/obj/effect/landmark/corpsespawner/scientist, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/corsat/greenwhite/north, /area/corsat/gamma/medbay) @@ -36328,12 +36125,6 @@ /obj/item/storage/box/bodybags, /turf/open/floor/corsat/purple/west, /area/corsat/omega/complex) -"sBA" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/effect/landmark/corpsespawner/scientist, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/white/east, -/area/corsat/gamma/residential/east) "sBK" = ( /obj/item/implant/neurostim, /obj/item/implant/neurostim, @@ -36646,7 +36437,6 @@ dir = 8; pixel_x = -11 }, -/obj/effect/landmark/corpsespawner/scientist, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/corsat/whitebluefull/southwest, /area/corsat/gamma/residential/researcher) @@ -37204,11 +36994,6 @@ }, /turf/open/floor/corsat/squares, /area/corsat/gamma/airlock/north/id) -"taB" = ( -/obj/structure/bed/nest, -/obj/effect/landmark/corpsespawner/doctor, -/turf/open/floor/corsat/plate, -/area/corsat/omega/biodome) "tbo" = ( /obj/structure/surface/table/reinforced, /turf/open/floor/corsat/purplewhitecorner/east, @@ -37478,11 +37263,6 @@ }, /turf/open/floor/corsat/purplewhite/north, /area/corsat/sigma/south/complex) -"thR" = ( -/obj/effect/landmark/corpsespawner/wysec, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/squares, -/area/corsat/sigma/south/security) "thT" = ( /obj/structure/machinery/light, /obj/structure/surface/rack, @@ -37818,11 +37598,6 @@ "tql" = ( /turf/open/floor/corsat/squareswood/north, /area/corsat/gamma/rnr/library) -"tqq" = ( -/obj/effect/landmark/corpsespawner/engineer, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/asteroidfloor/north, -/area/corsat/sigma/biodome) "tqu" = ( /obj/structure/surface/table/reinforced, /obj/item/clothing/mask/cigarette/cigar/cohiba, @@ -38007,11 +37782,6 @@ }, /turf/open/floor/corsat/retrosquareslight, /area/corsat/gamma/sigmaremote) -"tvv" = ( -/obj/effect/landmark/corpsespawner/pmc, -/obj/effect/decal/cleanable/blood/xtracks, -/turf/open/floor/corsat/squares, -/area/corsat/omega/airlocknorth) "tvD" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -38361,11 +38131,6 @@ /obj/structure/surface/table/reinforced, /turf/open/floor/corsat/purplewhite/east, /area/corsat/gamma/sigmaremote) -"tEV" = ( -/obj/effect/landmark/corpsespawner/engineer, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/squares, -/area/corsat/gamma/engineering/core) "tEW" = ( /obj/effect/landmark/hunter_secondary, /turf/open/floor/corsat/squareswood/north, @@ -39118,11 +38883,6 @@ /obj/item/storage/firstaid/regular, /turf/open/floor/corsat/greenwhite/southwest, /area/corsat/gamma/medbay/lobby) -"uar" = ( -/obj/effect/landmark/corpsespawner/engineer, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/yellow, -/area/corsat/sigma/south/robotics) "uaG" = ( /obj/item/reagent_container/food/snacks/grown/tomato, /obj/item/reagent_container/food/snacks/grown/tomato, @@ -39174,7 +38934,6 @@ /area/corsat/theta/biodome/complex) "ubH" = ( /obj/structure/bed/nest, -/obj/effect/landmark/corpsespawner/scientist, /turf/open/mars_cave/mars_cave_12, /area/corsat/sigma/biodome) "ubI" = ( @@ -39837,7 +39596,6 @@ /turf/open/floor/corsat/yellow/west, /area/corsat/sigma/south/robotics) "uuq" = ( -/obj/effect/landmark/corpsespawner/scientist, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/corsat/squares, /area/corsat/gamma/residential/east) @@ -40309,11 +40067,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/purplewhitecorner/west, /area/corsat/gamma/biodome/complex) -"uGE" = ( -/obj/effect/landmark/corpsespawner/scientist, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/retrosquares, -/area/corsat/sigma/hangar/checkpoint) "uGO" = ( /obj/structure/closet/secure_closet/freezer/fridge, /turf/open/floor/corsat/sterileplate, @@ -40574,11 +40327,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/plate, /area/corsat/gamma/sigmaremote) -"uOt" = ( -/obj/effect/landmark/corpsespawner/scientist, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/retrosquareslight, -/area/corsat/gamma/biodome/virology) "uOu" = ( /turf/open/mars_cave/mars_cave_22, /area/corsat/sigma/biodome/scrapyard) @@ -41064,11 +40812,6 @@ /obj/structure/surface/table/almayer, /turf/open/floor/corsat/red, /area/corsat/gamma/security) -"vbI" = ( -/obj/structure/bed/nest, -/obj/effect/landmark/corpsespawner/pmc, -/turf/open/mars_cave/mars_cave_2, -/area/corsat/sigma/biodome) "vbK" = ( /obj/structure/closet/wardrobe/science_white, /turf/open/floor/corsat/purplewhite/west, @@ -42221,11 +41964,6 @@ "vHA" = ( /turf/open/floor/corsat/redcorner/north, /area/corsat/gamma/airlock/south/id) -"vHS" = ( -/obj/effect/landmark/corpsespawner/chef, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/sterileplate, -/area/corsat/gamma/kitchen) "vHZ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -42501,11 +42239,6 @@ }, /turf/open/floor/corsat/purplewhitecorner/north, /area/corsat/omega/complex) -"vQH" = ( -/obj/effect/landmark/corpsespawner/wysec, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/plate, -/area/corsat/gamma/security) "vQN" = ( /turf/open/floor/corsat/yellow/east, /area/corsat/omega/control) @@ -43825,11 +43558,6 @@ /mob/living/carbon/human/yiren, /turf/open/auto_turf/snow/layer0, /area/corsat/gamma/biodome) -"wxk" = ( -/obj/effect/landmark/corpsespawner/scientist, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/corsat/retrosquares, -/area/corsat/sigma/hangar/arrivals) "wxN" = ( /obj/structure/surface/table/almayer, /obj/item/clipboard, @@ -45780,7 +45508,6 @@ /turf/open/floor/corsat/plate, /area/corsat/omega/checkpoint) "xBK" = ( -/obj/effect/landmark/corpsespawner/scientist, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/wood, /area/corsat/sigma/dorms) @@ -47845,7 +47572,7 @@ bfG bfg nfz xCy -ims +xCy nfz aiU aiU @@ -50131,7 +49858,7 @@ azX azX sWP sWP -eaO +kXf vse vse vse @@ -50140,11 +49867,11 @@ vse vse vse vCx -taB +kXf kXf vse vse -eZp +kXf kXf vCx vse @@ -50400,7 +50127,7 @@ vse vse vse vse -eZp +kXf sWP sWP azX @@ -51125,7 +50852,7 @@ uhU uhU uhU fLk -eaO +kXf vCx uhU vse @@ -51366,10 +51093,10 @@ vse vse vCx kXf -eaO +kXf vse vse -klV +kXf kXf vCx vse @@ -51585,7 +51312,7 @@ mGB nBP rsA rsA -tvv +ene rsA cQf jwT @@ -51995,7 +51722,7 @@ bIm bIm bIm bIm -ddm +nSk xpn pWe bbJ @@ -52515,7 +52242,7 @@ bfc bfh bfq bfi -ims +xCy xCy aEP oJn @@ -52589,14 +52316,14 @@ kEX vse sWP vCx -eaO -eaO -eZp +kXf +kXf +kXf vse vse -taB -eZp -klV +kXf +kXf +kXf vCx sWP vse @@ -52710,7 +52437,7 @@ aUH dQq tio tio -uOt +jYI dRm tio rWX @@ -53394,7 +53121,7 @@ whr jNX adJ bXR -jxg +uLm hDf kom kom @@ -55863,7 +55590,7 @@ qXn niX uhH hDf -jxg +uLm kom dCT adJ @@ -55964,7 +55691,7 @@ beO hOb ccY fDU -mSS +fDU fDU sOD aiO @@ -56806,7 +56533,7 @@ sFX sFX sFX sFX -eru +lqN lqN sFX deQ @@ -58017,7 +57744,7 @@ ylo aaj aaj dem -pXp +dem abb abD abs @@ -61705,7 +61432,7 @@ aaf abD alb abs -pXp +dem aFl tVY etQ @@ -61726,7 +61453,7 @@ sdu abD mcj aFX -pXp +dem aFl jkk sFX @@ -62949,7 +62676,7 @@ efs vHm nRC tLN -sBA +hjd wHv hjd tLN @@ -64452,7 +64179,7 @@ asm asm asm sKm -kRI +oeb xxz asq nMB @@ -64603,7 +64330,7 @@ kbr kbr kbr kbr -oRv +kbr kbr kbr kbr @@ -64915,7 +64642,7 @@ xCG xCG dQV sFX -qHA +lYI sFX deQ cco @@ -65577,7 +65304,7 @@ aEd aii cCZ cCZ -kwt +weY rOO rOO rOO @@ -66243,7 +65970,7 @@ mVp xWX bCS pTB -lKg +gNO gNO fYw bCS @@ -66858,7 +66585,7 @@ eqO aNK xEB oXd -vQH +cjY cjY oXd eFC @@ -67589,7 +67316,7 @@ vTa aNP eXV enH -fCq +xqg bkP tgZ dgQ @@ -68126,7 +67853,7 @@ vCB arx lHj mKt -vHS +fCV fCV pBe mKt @@ -68420,7 +68147,7 @@ nTq gVb gVb god -keH +god god gVb gVb @@ -71247,7 +70974,7 @@ hht hht mAH hdI -paa +hdI pEa pEa pEa @@ -71257,7 +70984,7 @@ pEa hdI hdI iIi -iEZ +hdI pEa pEa pEa @@ -71550,7 +71277,7 @@ gVb gVb gVb god -edg +god gVb gVb gVb @@ -71613,7 +71340,7 @@ ahB arr pcx cKH -inf +ykK rZV rZV fzv @@ -72564,7 +72291,7 @@ jwC hVS aqO mzO -ezu +nMJ rzu nMJ rzu @@ -75018,7 +74745,7 @@ aqY cmR paU rwx -kWs +xkV xkV xkV xkV @@ -76391,7 +76118,7 @@ mOO asA bky rNn -rzV +tSm eOn kJx acF @@ -76631,7 +76358,7 @@ ylo bky asA oOI -iNj +txT mOO asA bky @@ -76698,7 +76425,7 @@ apI nCC mbV mbV -tEV +ydp ydp mbV lsj @@ -85056,7 +84783,7 @@ pCZ rEm rEm tIk -vbI +cSZ bhn bhn bhn @@ -85538,7 +85265,7 @@ bhn bhn bhn bhn -gbg +cSZ tIk rEm nyO @@ -86026,7 +85753,7 @@ rEm bhn bhn bhn -njA +cSZ mpM tIk yae @@ -86281,7 +86008,7 @@ ndb rEm tYA mpM -gbg +cSZ bhn bhn bhn @@ -87005,7 +86732,7 @@ rEm rEm rEm bhn -njA +cSZ tIk rEm pCZ @@ -88274,7 +88001,7 @@ iDg iDg iDg iDg -tqq +cwc cwc iDg iDg @@ -88834,7 +88561,7 @@ jMc kQw vEW hSB -miu +hSB jYd xdW auB @@ -89721,7 +89448,7 @@ hOI eIl fCp opn -oeE +oXc xvg hKe hKe @@ -90069,7 +89796,7 @@ pet pRo ktB ktB -cgb +tZb tZb ktB xbK @@ -92259,7 +91986,7 @@ anE crc ihl vpV -thR +qsF jRS tzl anE @@ -93988,7 +93715,7 @@ ktB ktB ktB ktB -npb +tZb ktB chz auJ @@ -95699,7 +95426,7 @@ pet mBO auJ sRV -uar +szr igq wvG oGI @@ -99997,7 +99724,7 @@ alx hdQ rbf ekn -wxk +wjE rbf huD afJ @@ -100229,7 +99956,7 @@ ylo ylo akj ilA -qzz +rNi fiR fiR rNi @@ -100260,7 +99987,7 @@ gto gto gto tRI -uGE +tRI gto gto gto @@ -102994,7 +102721,7 @@ qCw aNH kah eXU -lUd +nRv nRv izU tUA @@ -103516,7 +103243,7 @@ fOq mMR vAs pKW -oZT +pKW vAs vAs mMR @@ -103660,7 +103387,7 @@ aRp akj nYz cDY -elS +whJ jDM bmF sXt @@ -104722,7 +104449,7 @@ alw ask asw xsZ -auU +atD avf asX ati @@ -106109,7 +105836,7 @@ eXK bEL bmG hEI -qFB +cDY whJ kcS bmF @@ -107405,7 +107132,7 @@ gBh dfg akl hpd -qbL +gzs kxh akl wvZ diff --git a/maps/map_files/CORSAT/standalone/lockdown_highsec.dmm b/maps/map_files/CORSAT/standalone/lockdown_highsec.dmm index dd4ef5005c6..87aac5bb1b0 100644 --- a/maps/map_files/CORSAT/standalone/lockdown_highsec.dmm +++ b/maps/map_files/CORSAT/standalone/lockdown_highsec.dmm @@ -132,10 +132,6 @@ "z" = ( /turf/open/floor/corsat/squares, /area/corsat/omega/checkpoint) -"A" = ( -/obj/effect/landmark/corpsespawner/pmc, -/turf/open/floor/corsat/squares, -/area/corsat/omega/checkpoint) "B" = ( /obj/structure/bed/chair/comfy/black{ icon_state = "comfychair"; @@ -298,7 +294,7 @@ g f n q -A +z z J n diff --git a/maps/map_files/CORSAT/standalone/sigma_ice.dmm b/maps/map_files/CORSAT/standalone/sigma_ice.dmm index 33d62da2e60..f01395119fd 100644 --- a/maps/map_files/CORSAT/standalone/sigma_ice.dmm +++ b/maps/map_files/CORSAT/standalone/sigma_ice.dmm @@ -240,11 +240,6 @@ }, /turf/open/ice, /area/corsat/sigma/biodome/ice) -"eV" = ( -/obj/effect/landmark/corpsespawner/engineer, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/asteroidfloor/north, -/area/corsat/sigma/biodome/ice) "fc" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /turf/open/ice, @@ -279,11 +274,6 @@ /obj/structure/pipes/standard/simple/visible, /turf/open/floor/plating, /area/corsat/inaccessible) -"fT" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/landmark/corpsespawner/engineer, -/turf/open/ice, -/area/corsat/sigma/biodome/scrapyard) "gd" = ( /obj/item/tool/shovel, /turf/open/auto_turf/snow/layer4, @@ -304,11 +294,6 @@ /obj/structure/bed/nest, /turf/open/ice, /area/corsat/sigma/biodome/ice) -"gx" = ( -/obj/structure/bed/nest, -/obj/effect/landmark/corpsespawner/engineer, -/turf/open/ice, -/area/corsat/sigma/biodome/ice) "gB" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -379,10 +364,6 @@ /obj/structure/cargo_container/grant/right, /turf/open/auto_turf/snow/layer2, /area/corsat/sigma/biodome/scrapyard) -"ih" = ( -/obj/effect/landmark/corpsespawner/pmc, -/turf/open/floor/asteroidfloor/north, -/area/corsat/sigma/biodome/gunrange) "io" = ( /obj/effect/alien/weeds/node, /turf/open/ice, @@ -606,16 +587,6 @@ }, /turf/template_noop, /area/template_noop) -"nB" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/landmark/corpsespawner/pmc, -/turf/open/ice, -/area/corsat/sigma/biodome/scrapyard) -"nI" = ( -/obj/structure/bed/nest, -/obj/effect/landmark/corpsespawner/scientist, -/turf/open/ice, -/area/corsat/sigma/biodome/ice) "nP" = ( /turf/open/auto_turf/snow/layer3, /area/corsat/sigma/biodome/scrapyard) @@ -1150,7 +1121,6 @@ "AJ" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/blood/oil, -/obj/effect/landmark/corpsespawner/pmc, /turf/open/floor/asteroidfloor/north, /area/corsat/sigma/biodome/scrapyard) "AS" = ( @@ -1702,7 +1672,6 @@ dir = 4 }, /obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpsespawner/pmc, /turf/open/floor/corsat/squares, /area/corsat/sigma/airlock/control) "ME" = ( @@ -3626,7 +3595,7 @@ TX cf TX TX -fT +Bf RM TX nq @@ -4275,7 +4244,7 @@ aO TX YC TX -nB +Bf TX nq Zf @@ -4710,7 +4679,7 @@ Wk Wk Wk Wk -gx +gr lr Zr io @@ -4718,7 +4687,7 @@ YN Zr Zr lr -nI +gr Wk Wk Wk @@ -4870,7 +4839,7 @@ Zr Wk Wk Wk -nI +gr fc lr Zr @@ -4961,7 +4930,7 @@ pP Zr Zr fc -gx +gr Wk Wk Wk @@ -5193,7 +5162,7 @@ Zr Zr Zr Wk -nI +gr fc Zr YN @@ -5541,7 +5510,7 @@ ZL bN cJ bN -ih +bN At bN bN @@ -5642,7 +5611,7 @@ hH hH hH hH -eV +jy jy hH hH @@ -6186,7 +6155,7 @@ aI ar rP bN -ih +bN cJ Xm Xm diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index 49c85de4c43..6285a01d492 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -5134,7 +5134,6 @@ /area/desert_dam/building/security/marshals_office) "bes" = ( /obj/structure/bed/chair/comfy/black, -/obj/effect/landmark/corpsespawner/security/marshal, /turf/open/floor/interior/wood/alt, /area/desert_dam/building/security/marshals_office) "bev" = ( @@ -7636,10 +7635,6 @@ /obj/structure/machinery/light, /turf/open/floor/prison, /area/desert_dam/building/security/prison) -"bQG" = ( -/obj/effect/landmark/corpsespawner/security/marshal, -/turf/open/floor/prison, -/area/desert_dam/building/security/warden) "bQH" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -11513,7 +11508,6 @@ /area/desert_dam/exterior/telecomm/lz2_containers) "cKk" = ( /obj/structure/bed, -/obj/effect/landmark/corpsespawner/prisoner, /turf/open/floor/prison, /area/desert_dam/building/security/execution_chamber) "cKl" = ( @@ -20333,7 +20327,6 @@ /area/desert_dam/interior/dam_interior/west_tunnel) "gmz" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/engineer, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/bright_clean/southwest, @@ -22288,10 +22281,6 @@ }, /turf/open/floor/prison/red/east, /area/desert_dam/building/water_treatment_one/lobby) -"hyR" = ( -/obj/effect/landmark/corpsespawner/security/marshal, -/turf/open/gm/river/darkred_pool, -/area/desert_dam/building/dorms/pool) "hzl" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 4 @@ -25813,7 +25802,6 @@ /area/desert_dam/exterior/valley/valley_civilian) "jAO" = ( /obj/structure/surface/table/woodentable/fancy, -/obj/effect/landmark/corpsespawner/security/liaison, /turf/open/floor/carpet15_15/west, /area/desert_dam/building/administration/overseer_office) "jAR" = ( @@ -26103,7 +26091,6 @@ /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, /obj/structure/bed/roller, -/obj/effect/landmark/corpsespawner/scientist, /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/whitegreen/east, /area/desert_dam/building/medical/east_wing_hallway) @@ -28933,10 +28920,6 @@ /obj/effect/spawner/random/toolbox, /turf/open/floor/prison/darkyellow2/north, /area/desert_dam/interior/dam_interior/smes_main) -"lwj" = ( -/obj/effect/landmark/corpsespawner/security/marshal, -/turf/open/floor/prison/floor_plate, -/area/desert_dam/building/security/evidence) "lwl" = ( /turf/open/floor/prison/sterile_white/west, /area/desert_dam/building/medical/treatment_room) @@ -37327,11 +37310,6 @@ /obj/structure/filingcabinet, /turf/open/floor/wood, /area/desert_dam/building/administration/overseer_office) -"qCT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/vault2/northeast, -/area/desert_dam/building/security/prison) "qCW" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/sterile_white/west, @@ -44967,11 +44945,6 @@ }, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/interior/dam_interior/primary_tool_storage) -"uYI" = ( -/obj/structure/bed, -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison/darkred2/east, -/area/desert_dam/building/security/deathrow) "uYW" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/colony{ name = "\improper Security Office" @@ -57410,7 +57383,7 @@ bNE mVN jeJ rZJ -qCT +kOc kOc kOc pBN @@ -58097,7 +58070,7 @@ pDE vEY aWK kBS -lwj +iAl iAl iAl aWK @@ -60922,7 +60895,7 @@ bWt jbh bJU pFV -uYI +rAM sAz bBL fSr @@ -61150,7 +61123,7 @@ eRG bJV bNi bNi -bQG +bNi bNi bWA dKr @@ -97028,7 +97001,7 @@ onZ vFZ lcM hFc -hyR +hFc hFc tDS dIk diff --git a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm index 1007c8348e4..1aac4431eb9 100644 --- a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm +++ b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm @@ -15,7 +15,6 @@ /turf/open/floor/plating, /area/prison/research/secret/testing) "aaf" = ( -/obj/effect/landmark/corpsespawner/prisoner, /obj/effect/decal/cleanable/blood/splatter, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/plating, @@ -180,10 +179,6 @@ /obj/effect/landmark/good_item, /turf/open/floor/plating, /area/prison/cellblock/maxsec/north) -"acp" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison, -/area/prison/cellblock/maxsec/north) "acq" = ( /obj/structure/toilet{ dir = 8; @@ -336,7 +331,6 @@ /obj/structure/machinery/light/small{ dir = 1 }, -/obj/effect/landmark/corpsespawner/prisoner, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/prison, /area/prison/research/secret/containment) @@ -371,14 +365,6 @@ }, /turf/open/floor/plating, /area/prison/research/secret/containment) -"adJ" = ( -/obj/structure/toilet{ - dir = 8; - pixel_x = -4 - }, -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison, -/area/prison/research/secret/containment) "adT" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -392,11 +378,6 @@ }, /turf/open/floor/prison, /area/prison/cellblock/maxsec/north) -"aea" = ( -/obj/structure/bed, -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison, -/area/prison/cellblock/maxsec/north) "aeb" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -592,11 +573,6 @@ /obj/effect/alien/weeds/node, /turf/open/floor/prison, /area/prison/cellblock/highsec/south/north) -"afW" = ( -/obj/structure/bed, -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison, -/area/prison/research/secret/containment) "afY" = ( /turf/open/floor/plating, /area/prison/research/secret/containment) @@ -721,10 +697,6 @@ }, /turf/open/floor/plating, /area/prison/cellblock/maxsec/north) -"agQ" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison, -/area/prison/research/secret/containment) "agR" = ( /obj/structure/machinery/light{ dir = 1 @@ -906,11 +878,6 @@ }, /turf/open/floor/prison, /area/prison/research/secret/dissection) -"aiM" = ( -/obj/structure/machinery/optable, -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison, -/area/prison/research/secret/dissection) "aiN" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/prison/research/secret) @@ -1176,10 +1143,6 @@ }, /turf/open/floor/plating, /area/prison/maintenance/research_medbay) -"akJ" = ( -/obj/effect/landmark/corpsespawner/scientist, -/turf/open/floor/prison, -/area/prison/research/secret/containment) "akK" = ( /turf/closed/wall/r_wall/prison, /area/prison/cellblock/maxsec/south) @@ -1264,7 +1227,6 @@ /turf/open/floor/plating, /area/prison/cellblock/maxsec/south) "alp" = ( -/obj/effect/landmark/corpsespawner/prison_security, /obj/item/reagent_container/food/drinks/bottle/whiskey, /turf/open/floor/plating, /area/prison/maintenance/research_medbay) @@ -1426,7 +1388,6 @@ /area/prison/cellblock/maxsec/south) "amm" = ( /obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpsespawner/prisoner, /turf/open/floor/prison, /area/prison/cellblock/maxsec/south) "ams" = ( @@ -1863,13 +1824,6 @@ }, /turf/open/floor/plating, /area/prison/hanger/research) -"aqs" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/landmark/corpsespawner/prison_security, -/turf/open/floor/plating, -/area/prison/cellblock/maxsec/south) "aqx" = ( /obj/structure/machinery/light{ dir = 4 @@ -1960,13 +1914,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/plating_catwalk/prison, /area/prison/cellblock/highsec/north/north) -"asj" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/plating/plating_catwalk/prison, -/area/prison/cellblock/highsec/north/north) "asl" = ( /obj/structure/pipes/standard/manifold/visible{ dir = 8 @@ -2393,10 +2340,6 @@ /obj/item/stack/rods, /turf/open/floor/wood, /area/prison/chapel) -"ayZ" = ( -/obj/effect/landmark/corpsespawner/scientist, -/turf/open/floor/prison, -/area/prison/research/secret) "azb" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/prison, @@ -3047,13 +2990,6 @@ }, /turf/open/floor/wood, /area/prison/quarters/research) -"aID" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/plating/plating_catwalk/prison, -/area/prison/cellblock/highsec/north/south) "aIE" = ( /turf/closed/wall/prison, /area/prison/medbay/foyer) @@ -3194,10 +3130,6 @@ }, /turf/open/floor/wood, /area/prison/residential/north) -"aJv" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/plating, -/area/prison/cellblock/highsec/north/south) "aJH" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk/prison, @@ -4019,10 +3951,6 @@ }, /turf/open/floor/plating, /area/prison/maintenance/residential/ne) -"aSj" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/plating/plating_catwalk/prison, -/area/prison/cellblock/highsec/north/south) "aSu" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -4600,10 +4528,6 @@ "aYY" = ( /turf/open/floor/prison, /area/prison/security/monitoring/highsec) -"aYZ" = ( -/obj/effect/landmark/corpsespawner/prison_security, -/turf/open/floor/prison, -/area/prison/security/monitoring/highsec) "aZa" = ( /obj/structure/window/framed/prison/reinforced, /turf/open/floor/plating, @@ -4915,13 +4839,6 @@ /obj/structure/window/framed/prison/reinforced, /turf/open/floor/plating, /area/prison/cellblock/highsec/north/south) -"bbY" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/plating/plating_catwalk/prison, -/area/prison/cellblock/highsec/north/south) "bcb" = ( /turf/open/floor/prison, /area/prison/security/checkpoint/highsec/n) @@ -5818,7 +5735,6 @@ /turf/open/floor/prison/darkred2/southwest, /area/prison/security/checkpoint/maxsec) "bpR" = ( -/obj/effect/landmark/corpsespawner/scientist, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/prison/sterile_white/southwest, /area/prison/research/secret/bioengineering) @@ -6600,11 +6516,6 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/prison/hallway/east) -"bCJ" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/plating/plating_catwalk/prison, -/area/prison/hallway/east) "bCK" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -6614,12 +6525,6 @@ /obj/structure/girder, /turf/open/floor/plating, /area/prison/maintenance/residential/access/south) -"bCN" = ( -/obj/structure/bed, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/landmark/corpsespawner/prison_security, -/turf/open/floor/prison, -/area/prison/quarters/security) "bCO" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -8509,10 +8414,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/prison, /area/prison/intake) -"bUK" = ( -/obj/effect/landmark/corpsespawner/prison_security, -/turf/open/floor/prison, -/area/prison/security) "bUS" = ( /obj/structure/shuttle/diagonal{ dir = 8; @@ -9549,7 +9450,7 @@ "ceG" = ( /obj/structure/bed, /obj/item/clothing/mask/cigarette/pipe, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /obj/structure/pipes/vents/pump/on, /turf/open/floor/prison, /area/prison/engineering) @@ -9840,7 +9741,6 @@ /turf/open/floor/plating, /area/prison/pirate) "chi" = ( -/obj/effect/landmark/corpsespawner/prison_security, /obj/effect/decal/cleanable/blood, /obj/item/weapon/gun/rifle/m16, /turf/open/floor/plating, @@ -9856,7 +9756,6 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/effect/landmark/corpsespawner/prison_security, /obj/effect/decal/cleanable/blood, /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/floor/plating, @@ -9876,7 +9775,6 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/effect/landmark/corpsespawner/prison_security, /obj/effect/decal/cleanable/blood, /obj/item/weapon/gun/rifle/m16, /turf/open/floor/plating, @@ -10151,7 +10049,6 @@ /obj/effect/decal/warning_stripes{ icon_state = "N" }, -/obj/effect/landmark/corpsespawner/prison_security, /obj/effect/decal/cleanable/blood, /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /obj/structure/surface/table/reinforced{ @@ -10603,14 +10500,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/plating, /area/prison/disposal) -"cnA" = ( -/obj/structure/machinery/conveyor{ - dir = 8 - }, -/obj/effect/landmark/corpsespawner/prisoner, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/plating, -/area/prison/disposal) "cnB" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/space) @@ -11326,13 +11215,6 @@ /obj/structure/window/framed/prison/reinforced, /turf/open/floor/plating, /area/prison/security/monitoring/medsec/central) -"csG" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/plating/plating_catwalk/prison, -/area/prison/cellblock/mediumsec/east) "csJ" = ( /obj/structure/machinery/door/airlock/almayer/secure/colony{ density = 0; @@ -11464,7 +11346,6 @@ /turf/open/floor/plating, /area/prison/pirate) "ctQ" = ( -/obj/effect/landmark/corpsespawner/prison_security, /obj/effect/decal/cleanable/blood, /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/floor/plating, @@ -12098,7 +11979,6 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 }, -/obj/effect/landmark/corpsespawner/prison_security, /turf/open/floor/prison, /area/prison/security/monitoring/medsec/south) "czC" = ( @@ -13417,10 +13297,6 @@ }, /turf/open/floor/prison/darkyellow2, /area/prison/hallway/engineering) -"dJY" = ( -/obj/effect/landmark/corpsespawner/prison_security, -/turf/open/floor/prison/bright_clean2/southwest, -/area/prison/hallway/central/south) "dKj" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -13699,7 +13575,6 @@ /obj/structure/bed/chair/office/dark{ dir = 1 }, -/obj/effect/landmark/corpsespawner/prison_security, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1; icon_state = "exposed01-supply" @@ -14038,10 +13913,6 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/prison/darkpurple2, /area/prison/research/secret/containment) -"egF" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison/cell_stripe/west, -/area/prison/cellblock/highsec/north/south) "egO" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -14912,10 +14783,6 @@ }, /turf/open/floor/chapel/northeast, /area/prison/chapel) -"eQE" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison/floor_plate, -/area/prison/cellblock/mediumsec/east) "eRy" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -15472,10 +15339,6 @@ }, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/cellblock/highsec/south/south) -"fnO" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison/cell_stripe/east, -/area/prison/cellblock/mediumsec/south) "fog" = ( /obj/structure/machinery/shower{ pixel_y = 15 @@ -16346,10 +16209,6 @@ /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkyellow2/northeast, /area/prison/hangar_storage/main) -"gdu" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison/cell_stripe/east, -/area/prison/cellblock/mediumsec/north) "gdw" = ( /obj/structure/surface/table/reinforced, /obj/item/trash/plate{ @@ -16458,10 +16317,6 @@ }, /turf/open/floor/prison/floor_plate/southwest, /area/prison/cellblock/lowsec/ne) -"ghR" = ( -/obj/effect/landmark/corpsespawner/prison_security, -/turf/open/floor/plating/plating_catwalk/prison, -/area/prison/cellblock/mediumsec/north) "ghY" = ( /obj/structure/closet/toolcloset, /turf/open/floor/prison/redfull, @@ -17738,16 +17593,10 @@ /turf/open/floor/prison/sterile_white/southwest, /area/prison/research) "hgh" = ( -/obj/effect/landmark/corpsespawner/scientist, /obj/effect/decal/cleanable/blood/splatter, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/prison/whitepurple/north, /area/prison/research/secret/testing) -"hgE" = ( -/obj/structure/bed, -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison/floor_plate, -/area/prison/cellblock/mediumsec/south) "hgJ" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -17960,10 +17809,6 @@ }, /turf/open/floor/prison/bright_clean_marked, /area/prison/research) -"hns" = ( -/obj/effect/landmark/corpsespawner/prison_security, -/turf/open/floor/prison/red, -/area/prison/cellblock/highsec/south/south) "hnD" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "Staff-Research Maintenance" @@ -18276,11 +18121,6 @@ }, /turf/open/floor/plating, /area/prison/cellblock/mediumsec/east) -"hzv" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/bright_clean/southwest, -/area/prison/hallway/east) "hzS" = ( /turf/open/floor/prison/whitepurplefull, /area/prison/research/secret/bioengineering) @@ -20187,10 +20027,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/yellow/west, /area/prison/cellblock/mediumsec/east) -"joe" = ( -/obj/effect/landmark/corpsespawner/prison_security, -/turf/open/floor/prison/darkred2, -/area/prison/security) "joT" = ( /obj/structure/surface/table/reinforced, /turf/open/floor/prison/redfull, @@ -20521,10 +20357,6 @@ }, /turf/open/floor/prison/red, /area/prison/cellblock/highsec/north/north) -"jBH" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison/bright_clean2/southwest, -/area/prison/holding/holding1) "jBJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -20567,11 +20399,6 @@ "jDQ" = ( /turf/open/floor/prison/darkpurple2/northeast, /area/prison/research/secret/containment) -"jDR" = ( -/obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison/floor_plate, -/area/prison/cellblock/mediumsec/south) "jEq" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -21585,10 +21412,6 @@ /obj/structure/surface/table/reinforced, /turf/open/floor/prison/darkredfull2/southwest, /area/prison/security/monitoring/highsec) -"kBU" = ( -/obj/effect/landmark/corpsespawner/prison_security, -/turf/open/floor/prison/kitchen/southwest, -/area/prison/recreation/highsec/s) "kCz" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -21740,7 +21563,6 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/effect/landmark/corpsespawner/prison_security, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 }, @@ -21922,13 +21744,6 @@ }, /turf/open/floor/chapel, /area/prison/chapel) -"kRd" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, -/obj/effect/landmark/corpsespawner/prison_security, -/turf/open/floor/prison/darkred2/east, -/area/prison/security/checkpoint/maxsec) "kRg" = ( /obj/structure/surface/table/reinforced, /turf/open/floor/prison/sterile_white/southwest, @@ -22772,7 +22587,6 @@ /obj/structure/pipes/vents/pump{ dir = 4 }, -/obj/effect/landmark/corpsespawner/prison_security, /turf/open/floor/prison/yellow/west, /area/prison/cellblock/mediumsec/west) "lEC" = ( @@ -24814,7 +24628,6 @@ /area/prison/security/checkpoint/vip) "nnC" = ( /obj/structure/machinery/optable, -/obj/effect/landmark/corpsespawner/prisoner, /obj/structure/machinery/light{ dir = 8 }, @@ -24856,10 +24669,6 @@ }, /turf/open/floor/prison/floor_plate/southwest, /area/prison/cellblock/lowsec/ne) -"npU" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison/floor_plate/southwest, -/area/prison/cellblock/highsec/north/south) "nqj" = ( /turf/open/floor/prison/red/west, /area/prison/cellblock/highsec/north/north) @@ -25292,11 +25101,6 @@ }, /turf/open/floor/prison/greencorner/east, /area/prison/cellblock/lowsec/sw) -"nHi" = ( -/obj/structure/bed, -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison/bright_clean2/southwest, -/area/prison/holding/holding1) "nHA" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -26489,15 +26293,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/floor_plate, /area/prison/cellblock/protective) -"oIH" = ( -/obj/structure/bed, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/effect/landmark/corpsespawner/chef, -/turf/open/floor/prison/greenfull, -/area/prison/quarters/staff) "oIS" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -26942,16 +26737,6 @@ }, /turf/open/floor/prison/bright_clean/southwest, /area/prison/visitation) -"paY" = ( -/obj/structure/sink{ - pixel_y = 15 - }, -/obj/structure/mirror{ - pixel_y = 28 - }, -/obj/effect/landmark/corpsespawner/prison_security, -/turf/open/floor/prison/bright_clean2/southwest, -/area/prison/toilet/security) "paZ" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ dir = 2; @@ -27018,12 +26803,6 @@ }, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/hallway/central/west) -"pcF" = ( -/obj/structure/bed, -/obj/effect/landmark/corpsespawner/prisoner, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/bright_clean/southwest, -/area/prison/holding/holding2) "pcI" = ( /obj/structure/surface/table/reinforced{ dir = 8; @@ -27599,7 +27378,6 @@ /area/prison/cellblock/lowsec/nw) "pAP" = ( /obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpsespawner/doctor, /turf/open/floor/prison/whitegreen/southwest, /area/prison/medbay) "pBa" = ( @@ -27720,11 +27498,6 @@ }, /turf/open/floor/prison/darkred2/east, /area/prison/security/checkpoint/medsec) -"pFW" = ( -/obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/prison_security, -/turf/open/floor/prison/bright_clean2/southwest, -/area/prison/hallway/central/south) "pGe" = ( /obj/structure/toilet{ dir = 4 @@ -28746,10 +28519,6 @@ /obj/structure/machinery/vending/snack, /turf/open/floor/prison/darkredfull2/southwest, /area/prison/monorail/east) -"qvO" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison/floor_plate/southwest, -/area/prison/recreation/highsec/n) "qwr" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/prison/yellow/west, @@ -29353,10 +29122,6 @@ }, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/residential/south) -"qZi" = ( -/obj/effect/landmark/corpsespawner/prison_security, -/turf/open/floor/prison/darkredfull2/southwest, -/area/prison/security) "qZA" = ( /obj/structure/barricade/handrail/wire, /turf/open/floor/prison/darkyellow2, @@ -30140,7 +29905,6 @@ /turf/open/floor/prison/darkredfull2/southwest, /area/prison/security/checkpoint/highsec/n) "rFa" = ( -/obj/effect/landmark/corpsespawner/prison_security, /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/damaged2/southwest, /area/prison/hallway/central/south) @@ -30447,10 +30211,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/prison/sterile_white, /area/prison/hallway/staff) -"rRp" = ( -/obj/effect/landmark/corpsespawner/scientist, -/turf/open/floor/prison/whitepurple, -/area/prison/research/secret/chemistry) "rRs" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -30922,10 +30682,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/floor_plate, /area/prison/cellblock/mediumsec/east) -"snW" = ( -/obj/effect/landmark/corpsespawner/prison_security, -/turf/open/floor/prison/red/north, -/area/prison/cellblock/highsec/south/south) "son" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -31045,7 +30801,6 @@ /obj/structure/pipes/vents/pump{ dir = 8 }, -/obj/effect/landmark/corpsespawner/prison_security, /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/darkbrown2/east, /area/prison/hallway/east) @@ -31446,14 +31201,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/prison/darkredfull2/southwest, /area/prison/security/checkpoint/highsec/n) -"sNX" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison/floor_plate, -/area/prison/cellblock/mediumsec/south) "sOl" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/floor/plating, @@ -31563,11 +31310,6 @@ }, /turf/open/floor/prison/bright_clean/southwest, /area/prison/yard) -"sSA" = ( -/obj/structure/bed, -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison/floor_plate, -/area/prison/cellblock/mediumsec/east) "sSB" = ( /obj/structure/toilet, /turf/open/floor/prison/cell_stripe/west, @@ -32501,12 +32243,6 @@ }, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/canteen) -"tFH" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/corpsespawner/prison_security, -/turf/open/floor/plating, -/area/prison/hallway/central/south) "tFP" = ( /obj/structure/surface/table/reinforced{ dir = 1; @@ -32886,7 +32622,6 @@ /turf/open/floor/prison/southwest, /area/prison/cellblock/highsec/north/north) "tUe" = ( -/obj/effect/landmark/corpsespawner/prison_security, /obj/effect/decal/cleanable/blood, /obj/item/weapon/gun/rifle/m16, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -33161,10 +32896,6 @@ /obj/structure/pipes/vents/pump/on, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/toilet/security) -"ujq" = ( -/obj/effect/landmark/corpsespawner/prison_security, -/turf/open/floor/prison/redcorner/east, -/area/prison/cellblock/highsec/south/north) "ujw" = ( /obj/structure/bed/chair{ dir = 1 @@ -34032,13 +33763,6 @@ /obj/structure/filingcabinet, /turf/open/floor/prison/darkred2/northwest, /area/prison/security/checkpoint/hangar) -"vav" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/landmark/corpsespawner/chef, -/turf/open/floor/prison/kitchen, -/area/prison/kitchen) "vax" = ( /turf/open/floor/prison/sterile_white, /area/prison/residential/north) @@ -34247,10 +33971,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/prison/darkyellow2, /area/prison/engineering) -"viZ" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison/cell_stripe/east, -/area/prison/cellblock/highsec/north/south) "vkc" = ( /obj/effect/decal/cleanable/blood, /obj/structure/pipes/standard/simple/hidden/supply, @@ -34383,7 +34103,6 @@ /area/prison/cellblock/highsec/south/south) "vqO" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/prison_security, /turf/open/floor/prison/darkred2/southwest, /area/prison/cellblock/mediumsec/east) "vqW" = ( @@ -35462,11 +35181,6 @@ "wob" = ( /turf/open/floor/prison/yellow/east, /area/prison/recreation/medsec) -"woc" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/bright_clean/southwest, -/area/prison/holding/holding2) "won" = ( /obj/structure/machinery/light{ dir = 1 @@ -35534,7 +35248,6 @@ /obj/structure/bed/chair/office/dark{ dir = 1 }, -/obj/effect/landmark/corpsespawner/prison_security, /turf/open/floor/prison/darkred2/north, /area/prison/security/monitoring/protective) "wqL" = ( @@ -35967,7 +35680,6 @@ /area/prison/hanger/research) "wIw" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/landmark/corpsespawner/prison_security, /turf/open/floor/prison/damaged1/southwest, /area/prison/cellblock/protective) "wIZ" = ( @@ -36230,7 +35942,6 @@ /turf/open/floor/prison/bright_clean2/southwest, /area/prison/holding/holding1) "wTF" = ( -/obj/effect/landmark/corpsespawner/prison_security, /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/floor/plating, /area/prison/cellblock/mediumsec/east) @@ -37767,13 +37478,6 @@ }, /turf/open/floor/prison/darkredfull2/southwest, /area/prison/security/monitoring/lowsec/ne) -"yhz" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison/cell_stripe/east, -/area/prison/cellblock/mediumsec/east) "yhG" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating, @@ -52625,7 +52329,7 @@ aAO aAO aWz aXK -aYZ +aYY bab bba dXM @@ -53457,7 +53161,7 @@ ktx wyi raB aCl -aID +aEP gDc aCl aEP @@ -54747,7 +54451,7 @@ aCl aKx aCl sSB -egF +dIW dIW mAb bdI @@ -55794,7 +55498,7 @@ gOk pEW aCl reb -viZ +gOk pEW aCl tte @@ -56275,7 +55979,7 @@ tpP jhP fez jhP -ujq +ijy hcK xas kaI @@ -56868,7 +56572,7 @@ qHz gRZ dHu cGT -bbY +aJQ uVN baw bfc @@ -57489,7 +57193,7 @@ rls aBg aKx aCl -aJv +aKx aCl opD aDS @@ -57682,7 +57386,7 @@ ebO duF aor wcQ -asj +app duB gJp yeq @@ -58332,7 +58036,7 @@ uWQ lyp tGO tkJ -qvO +lyp mBR aBg oyz @@ -58776,7 +58480,7 @@ qHz gRZ aEV wNP -npU +gDc oGH baw uhs @@ -59405,7 +59109,7 @@ aNg uXv aCl kfB -aSj +aDS pNa dHu qHz @@ -59479,7 +59183,7 @@ tlc cVL cag cag -ghR +cag cco llr lch @@ -60091,7 +59795,7 @@ bMh bOm bOm bDe -kBU +bDe bOm bOm bOm @@ -60109,7 +59813,7 @@ bYC bYC bYC bYC -snW +dYd jnE bZW cca @@ -60524,7 +60228,7 @@ bYC bYC bYC dYd -hns +iNj bYC bYC bYC @@ -60756,7 +60460,7 @@ veB kUw cun ykS -hgE +rWV cun ykS rWV @@ -60974,7 +60678,7 @@ cuM gCf cun cuM -jDR +mmr cun dnm jta @@ -62524,7 +62228,7 @@ gNM add afe abR -acp +aeQ add afe abR @@ -63826,7 +63530,7 @@ alH akF cGG ani -aqs +alF all tjn akF @@ -64362,7 +64066,7 @@ cun ykS rWV cun -sNX +ykS rWV cun ykS @@ -64777,7 +64481,7 @@ ccV dgZ sZv ccV -gdu +dgZ sZv ccV fOU @@ -64801,7 +64505,7 @@ cun vdN hYy cun -fnO +vdN hYy cun jbI @@ -64904,7 +64608,7 @@ qpw aBL ieb iBe -kRd +vca hoS aBL nrD @@ -65496,10 +65200,10 @@ acs add adn aeO -aea +aeN add adn -acp +aeQ add add add @@ -66700,7 +66404,7 @@ cpU rNg ggW cpU -sSA +rNg ggW cpU dMw @@ -66903,7 +66607,7 @@ cpU rcR see cpU -csG +cok jWl cpU cok @@ -68381,7 +68085,7 @@ ccV dgZ nJY cpU -yhz +rcR nJY cpU cpY @@ -69105,7 +68809,7 @@ bcH jwO paZ gyK -afW +agM agJ oek hyr @@ -69412,7 +69116,7 @@ vHX lWT iEa hmk -pFW +suY hPJ iEa kFQ @@ -69533,7 +69237,7 @@ hyr hyr gEQ agL -akJ +agL eJg aed agL @@ -69622,7 +69326,7 @@ bqs lwD vHX gAV -tFH +aab aab nPN ewb @@ -70047,7 +69751,7 @@ iEa iEa fdk suY -dJY +iEa oBG gAV dOr @@ -70794,7 +70498,7 @@ cEy cEy fHF agt -agQ +agL ahb aed bcH @@ -71431,7 +71135,7 @@ acH acH agt agL -adJ +ahb aed jDQ uUH @@ -71656,13 +71360,13 @@ ndf jBL aiq alf -aiM +ajn alx alx ajn alx alx -aiM +ajn alC apv rOf @@ -71868,10 +71572,10 @@ veM pbi aip alf -aiM +ajn alx alx -aiM +ajn alx alx ajn @@ -72421,7 +72125,7 @@ cpU rNg ggW cpU -sSA +rNg ggW jWl cqh @@ -72507,9 +72211,9 @@ aiD aiQ aiV alx -aiM ajn -aiM +ajn +ajn ajn alC alx @@ -72627,7 +72331,7 @@ fho pGX dZS cpU -csG +cok jWl cpU cok @@ -74110,9 +73814,9 @@ cok jWl crc cok -eQE +jWl cpU -csG +cok jWl cpU cok @@ -74418,7 +74122,7 @@ ajk oYh fDi mpS -rRp +mXk duK ajk yij @@ -75119,10 +74823,10 @@ aVS aUZ ucU nyC -nHi +sdS qlg vmD -jBH +vmD qlg sdS sdS @@ -75136,7 +74840,7 @@ vJz elC sbh vJz -pcF +elC uaQ vJz vJz @@ -75679,7 +75383,7 @@ aAO aAO aiN ihG -ayZ +agw aiN aAO acL @@ -76826,7 +76530,7 @@ bue fFX bEA bDM -hzv +lTm bHJ bHJ bHJ @@ -77044,7 +76748,7 @@ dcp sbh sbh xPz -woc +oZO sbh sbh sbh @@ -77070,7 +76774,7 @@ xEy cgL cmt chH -cnA +cnz cos coT cpA @@ -78308,7 +78012,7 @@ iqw fzJ sFs jei -bCJ +bEG bDM lTm jUC @@ -79330,7 +79034,7 @@ aCe urF ktZ cOR -oIH +tol hfK cde aWY @@ -80406,7 +80110,7 @@ vSw rRs kEF kjZ -vav +moe wjO bdl bmH @@ -82147,7 +81851,7 @@ gXo bZF bMu cev -joe +oZU cgQ jwu cje @@ -82988,7 +82692,7 @@ nsN bMu pAv nBE -bUK +bMu sJq bZp bMq @@ -84456,7 +84160,7 @@ bzg bys bzG bAR -bCN +bAR bEa bED bFL @@ -84905,7 +84609,7 @@ olO cce bMu faO -qZi +kZf faO vNY cgY @@ -86375,7 +86079,7 @@ bHY byt bKN bKN -paY +oQE mRK gVa bKN diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index 9bc3435d0dd..db71084bd05 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -79,10 +79,6 @@ /obj/item/trash/boonie, /turf/open/floor/prison/sterile_white/southwest, /area/fiorina/station/medbay) -"adC" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/redfull, -/area/fiorina/station/security) "adD" = ( /obj/structure/bed/roller, /obj/structure/machinery/iv_drip{ @@ -1851,10 +1847,6 @@ /obj/item/tool/scythe, /turf/open/floor/prison/blue_plate/west, /area/fiorina/station/botany) -"brC" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) "brI" = ( /obj/structure/platform/kutjevo/smooth{ dir = 1 @@ -3709,7 +3701,6 @@ icon_state = "4" }, /obj/item/prop/helmetgarb/flair_initech, -/obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison, /area/fiorina/station/medbay) "cPK" = ( @@ -4475,10 +4466,6 @@ /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/yellow/northwest, /area/fiorina/station/disco) -"drj" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/darkyellow2/west, -/area/fiorina/lz/near_lzI) "dro" = ( /obj/structure/closet/l3closet/general, /turf/open/floor/prison, @@ -6195,10 +6182,6 @@ "eDn" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/central_ring) -"eDv" = ( -/obj/effect/landmark/corpsespawner/prison_security, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/station/medbay) "eDJ" = ( /obj/item/explosive/grenade/incendiary/molotov, /turf/open/floor/prison/red/east, @@ -6207,10 +6190,6 @@ /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /turf/open/floor/prison/whitegreen/northeast, /area/fiorina/tumor/ice_lab) -"eDY" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/medbay) "eEd" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_sn_full_cap" @@ -7636,10 +7615,6 @@ /obj/item/stack/sheet/wood, /turf/open/floor/prison/whitepurple/southeast, /area/fiorina/station/research_cells) -"fGd" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/gm/river/darkred_pool, -/area/fiorina/station/park) "fGe" = ( /obj/structure/window/reinforced{ dir = 8 @@ -8175,10 +8150,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) -"fZB" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/security) "fZD" = ( /obj/item/tool/warning_cone, /turf/open/floor/wood, @@ -10085,7 +10056,6 @@ /obj/structure/bed/chair/office/light{ dir = 4 }, -/obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/wood, /area/fiorina/lz/near_lzI) "hvF" = ( @@ -10264,7 +10234,6 @@ /turf/open/floor/prison/floor_plate, /area/fiorina/lz/near_lzII) "hDq" = ( -/obj/effect/landmark/corpsespawner/engineer, /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/sand/layer1, /area/fiorina/tumor/civres) @@ -10348,10 +10317,6 @@ /obj/item/stack/sandbags, /turf/open/floor/prison/kitchen, /area/fiorina/station/power_ring) -"hIg" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/whitegreen/west, -/area/fiorina/station/medbay) "hIM" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/cell_stripe/east, @@ -11358,7 +11323,6 @@ layer = 3.5 }, /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/prison_security, /turf/open/floor/wood, /area/fiorina/station/park) "ivB" = ( @@ -11713,7 +11677,6 @@ "iKG" = ( /obj/structure/bed/chair, /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/prison_security, /turf/open/floor/prison, /area/fiorina/station/park) "iKP" = ( @@ -12057,10 +12020,6 @@ "iXL" = ( /turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_tram) -"iYl" = ( -/obj/effect/landmark/corpsespawner/ua_riot/burst, -/turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) "iYC" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -12073,7 +12032,6 @@ /area/fiorina/station/central_ring) "iYX" = ( /obj/structure/surface/table/reinforced/prison, -/obj/effect/landmark/corpsespawner/doctor, /turf/open/floor/prison/bluefull, /area/fiorina/station/civres_blue) "jah" = ( @@ -12659,10 +12617,6 @@ /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) -"jyP" = ( -/obj/effect/landmark/corpsespawner/ua_riot/burst, -/turf/open/floor/plating/prison, -/area/fiorina/station/medbay) "jyR" = ( /obj/structure/largecrate/supply/supplies/tables_racks, /turf/open/floor/prison, @@ -13225,7 +13179,6 @@ /obj/structure/bed/chair{ dir = 1 }, -/obj/effect/landmark/corpsespawner/security/liaison, /turf/open/floor/prison/darkbrown2/east, /area/fiorina/station/park) "jUs" = ( @@ -13834,10 +13787,6 @@ /obj/effect/landmark/monkey_spawn, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/medbay) -"kvH" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/station/medbay) "kvT" = ( /obj/item/tool/shovel/spade, /turf/open/floor/prison/blue_plate/north, @@ -15170,7 +15119,6 @@ /area/fiorina/station/park) "lFc" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/security/liaison, /turf/open/floor/wood, /area/fiorina/station/park) "lGm" = ( @@ -15917,7 +15865,6 @@ /obj/structure/bed{ icon_state = "abed" }, -/obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison/floor_plate, /area/fiorina/station/telecomm/lz1_cargo) "mle" = ( @@ -16024,10 +15971,6 @@ /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/floor_plate, /area/fiorina/station/security/wardens) -"moW" = ( -/obj/effect/landmark/corpsespawner/ua_riot/burst, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/servers) "moY" = ( /obj/item/trash/used_stasis_bag, /turf/open/floor/prison/floor_plate, @@ -16820,10 +16763,6 @@ }, /turf/open/floor/prison/yellow/southwest, /area/fiorina/station/disco) -"mUe" = ( -/obj/effect/landmark/corpsespawner/engineer, -/turf/open/floor/prison/bluecorner/north, -/area/fiorina/station/power_ring) "mUp" = ( /obj/structure/barricade/handrail{ dir = 8 @@ -17364,10 +17303,6 @@ /obj/item/stack/rods, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"nrq" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison, -/area/fiorina/station/disco) "nrL" = ( /obj/structure/barricade/sandbags{ icon_state = "sandbag_0"; @@ -18179,10 +18114,6 @@ }, /turf/open/floor/prison, /area/fiorina/tumor/servers) -"ocX" = ( -/obj/effect/landmark/corpsespawner/engineer, -/turf/open/floor/prison/bluefull, -/area/fiorina/station/power_ring) "odo" = ( /turf/open/floor/prison/yellowcorner, /area/fiorina/station/lowsec) @@ -19388,10 +19319,6 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/oob) -"oWz" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) "oWF" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, @@ -20002,10 +19929,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"pxj" = ( -/obj/effect/landmark/corpsespawner/ua_riot/burst, -/turf/open/floor/prison/greenfull/east, -/area/fiorina/tumor/civres) "pxk" = ( /obj/structure/closet/cabinet, /obj/item/reagent_container/pill/cyanide, @@ -21535,7 +21458,6 @@ dir = 1; pixel_y = 21 }, -/obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison/whitegreen/north, /area/fiorina/station/medbay) "qFE" = ( @@ -21802,10 +21724,6 @@ /obj/item/stack/rods/plasteel, /turf/open/floor/prison/darkyellow2/northeast, /area/fiorina/lz/near_lzI) -"qRT" = ( -/obj/effect/landmark/corpsespawner/ua_riot/burst, -/turf/open/floor/prison/greenfull/northwest, -/area/fiorina/tumor/civres) "qSp" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -23439,10 +23357,6 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/disco) -"sdG" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/telecomm/lz1_cargo) "sdK" = ( /obj/structure/surface/table/woodentable, /obj/item/device/flashlight/lamp{ @@ -25461,10 +25375,6 @@ "tOc" = ( /turf/open/floor/wood, /area/fiorina/station/disco) -"tOh" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/gm/river/red_pool, -/area/fiorina/station/park) "tOp" = ( /obj/structure/window/framed/prison/cell, /turf/open/floor/plating/prison, @@ -25647,10 +25557,6 @@ /obj/structure/platform_decoration, /turf/open/floor/prison/blue/southeast, /area/fiorina/station/power_ring) -"tVV" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) "tVW" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/yellow/southwest, @@ -25915,10 +25821,6 @@ /obj/item/clothing/gloves/boxing, /turf/open/floor/prison/yellow/southwest, /area/fiorina/station/lowsec) -"ugT" = ( -/obj/effect/landmark/corpsespawner/ua_riot/burst, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/aux_engi) "uha" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin{ @@ -26235,7 +26137,6 @@ /area/fiorina/station/research_cells) "uuj" = ( /obj/item/trash/uscm_mre, -/obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison/darkyellow2/west, /area/fiorina/station/flight_deck) "uuD" = ( @@ -26375,10 +26276,6 @@ }, /turf/open/floor/prison/bluefull, /area/fiorina/station/power_ring) -"uAk" = ( -/obj/effect/landmark/corpsespawner/ua_riot/burst, -/turf/open/floor/prison/floor_plate, -/area/fiorina/tumor/servers) "uAN" = ( /obj/effect/decal/hefa_cult_decals/d32{ icon_state = "2" @@ -26635,10 +26532,6 @@ "uMw" = ( /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"uMJ" = ( -/obj/effect/landmark/corpsespawner/ua_riot/burst, -/turf/open/floor/prison/darkpurple2/north, -/area/fiorina/tumor/servers) "uMV" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/prison/floor_plate, @@ -28001,10 +27894,6 @@ /obj/item/storage/pill_bottle/kelotane/skillless, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/tumor/ice_lab) -"vOj" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison, -/area/fiorina/station/security) "vOz" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison, @@ -30935,10 +30824,6 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/flight_deck) -"yhQ" = ( -/obj/effect/landmark/corpsespawner/ua_riot/burst, -/turf/open/floor/prison/floor_plate, -/area/fiorina/tumor/civres) "yhR" = ( /obj/structure/sign/prop3{ desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." @@ -40261,7 +40146,7 @@ oeb xHV dIo vRz -pxj +dCc wSn dIo xHV @@ -40889,7 +40774,7 @@ dXG lLe dXG dXG -qRT +oVR oVR oVR oVR @@ -41309,7 +41194,7 @@ oeb swU oeb oeb -yhQ +oeb dCc dCc oeb @@ -42180,7 +42065,7 @@ oVR kUj kUj oVR -qRT +oVR cvC cvC xwL @@ -43038,7 +42923,7 @@ kZv fpn kZv rGq -ugT +rGq rGq rGq kZv @@ -44248,7 +44133,7 @@ agi agi hoZ hoZ -moW +hoZ hoZ hoZ agi @@ -45637,7 +45522,7 @@ hCH xGf oLg vjk -fGd +qKl qKl xdk sud @@ -45849,7 +45734,7 @@ wbI tTE iDH gNG -tOh +rcL gdi xdk nUo @@ -46062,7 +45947,7 @@ tTE iDH gNG rcL -fGd +qKl xdk tTE iDH @@ -48677,7 +48562,7 @@ hoZ hoZ hoZ sqs -moW +hoZ njx njx nKj @@ -52500,11 +52385,11 @@ ekn xgo iOM qQO -uAk +sqs njx siR aHO -uMJ +siR iOM njx siR @@ -56568,7 +56453,7 @@ lBf lBf hBH lBf -hIg +lBf oME uuS cfV @@ -58259,7 +58144,7 @@ jWi hjL bNf jnh -jyP +mEO cfV dWg hVI @@ -59319,7 +59204,7 @@ qNY gMD aTV qdC -eDv +eoy cfV uuS hVI @@ -60666,7 +60551,7 @@ fnB fnB cUJ hVG -vOj +fnB yft dpI fGe @@ -61091,7 +60976,7 @@ cUJ gRE gFs nZx -fZB +cUJ hVG yft fnB @@ -61226,7 +61111,7 @@ hVI uPU jWi jWi -eDY +jWi jWi jWi vBT @@ -62482,7 +62367,7 @@ fjh jWi hVI lpV -kvH +eoy jWi eoy ygv @@ -62582,7 +62467,7 @@ gRE fnB yiS del -vOj +fnB cUJ hVG cUJ @@ -63427,7 +63312,7 @@ oXv oXv gIB mja -adC +gRE gRE cUJ gRE @@ -67582,7 +67467,7 @@ cKa wCp chv cKa -iYl +gRI fqe hdl cKa @@ -67627,7 +67512,7 @@ blG kqC kqC kqC -tVV +vRA vRA oFI gLJ @@ -70388,7 +70273,7 @@ jWn hAI fbK cfE -brC +tra urp tra mrp @@ -71854,7 +71739,7 @@ qsy lDA ecM nSx -nrq +gqe uVQ gqe gqe @@ -72470,7 +72355,7 @@ hxq etr ivl ivl -sdG +ivl ivl ivl ivl @@ -74229,7 +74114,7 @@ bnr kfa eQS ifT -mUe +eQb eHR uiX lCH @@ -75017,7 +74902,7 @@ cUg oUg iuy ojJ -sdG +ivl ivl gqp etr @@ -75707,7 +75592,7 @@ mxQ lAS uTk uQf -ocX +kfa uQf kfa kfa @@ -76930,7 +76815,7 @@ bQM kPz xDw tFn -drj +tYz uNY dOX xmp @@ -77364,7 +77249,7 @@ acH wSu tYz acH -drj +tYz cUj uRA oeQ @@ -78811,7 +78696,7 @@ cAW cAW xDw fgo -oWz +hKI hKI hKI tFn diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/15.birthdayparty.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/15.birthdayparty.dmm index 4013f260542..631d203023b 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/15.birthdayparty.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/15.birthdayparty.dmm @@ -11,7 +11,6 @@ /turf/open/floor/prison/floor_plate, /area/template_noop) "e" = ( -/obj/effect/landmark/corpsespawner/prison_security, /obj/item/clothing/head/cakehat{ pixel_x = -10 }, diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/15.nogear.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/15.nogear.dmm index 2a10734ee99..e9df9af1bbd 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/15.nogear.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/15.nogear.dmm @@ -148,10 +148,6 @@ /obj/item/frame/rack, /turf/open/floor/prison/redfull, /area/template_noop) -"aQ" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/floor_plate, -/area/template_noop) "aR" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall/prison, @@ -179,10 +175,6 @@ }, /turf/open/floor/prison/floor_plate, /area/template_noop) -"aZ" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison, -/area/template_noop) "UA" = ( /obj/structure/bed/chair{ dir = 1 @@ -232,7 +224,7 @@ aP aa "} (5,1,1) = {" -aZ +ac ab aJ aE @@ -253,7 +245,7 @@ ae "} (7,1,1) = {" UA -aQ +ap ah av ax diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/15.wardenofficedecorated.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/15.wardenofficedecorated.dmm index d78534bd97f..25f78fe5ac6 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/15.wardenofficedecorated.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/15.wardenofficedecorated.dmm @@ -105,7 +105,6 @@ /turf/open/floor/carpet, /area/template_noop) "T" = ( -/obj/effect/landmark/corpsespawner/prison_security, /obj/item/clothing/head/helmet/warden{ pixel_x = -9; pixel_y = 5 diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.gamertime.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.gamertime.dmm index 5a519e1529c..ce56c699c38 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.gamertime.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.gamertime.dmm @@ -6,7 +6,6 @@ "aU" = ( /obj/structure/bed/chair/comfy, /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/engineer, /turf/open/floor/prison/darkpurple2, /area/template_noop) "bh" = ( @@ -14,7 +13,6 @@ dir = 8 }, /obj/effect/decal/cleanable/blood/oil/streak, -/obj/effect/landmark/corpsespawner/prisoner, /turf/open/floor/prison/darkpurplefull2, /area/template_noop) "da" = ( @@ -172,14 +170,12 @@ dir = 8 }, /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/prisoner, /turf/open/floor/prison/darkpurple2/west, /area/template_noop) "xP" = ( /obj/structure/bed/chair{ dir = 4 }, -/obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison/darkpurple2/east, /area/template_noop) "yx" = ( @@ -251,7 +247,6 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/effect/landmark/corpsespawner/ua_riot/burst, /turf/open/floor/prison/darkpurplefull2, /area/template_noop) "Lx" = ( diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm index d0332503f1f..3331637ef72 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm @@ -544,10 +544,6 @@ "ut" = ( /turf/open/floor/prison/darkbrown2/east, /area/template_noop) -"uv" = ( -/obj/effect/landmark/corpsespawner/ua_riot/burst, -/turf/open/floor/prison/darkbrown2/north, -/area/template_noop) "uO" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -1219,10 +1215,6 @@ }, /turf/open/floor/prison/bright_clean2/southwest, /area/template_noop) -"XS" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/wood, -/area/template_noop) "Yd" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/wood, @@ -1408,7 +1400,7 @@ Wj CR ni ni -XS +nf nf ls VE @@ -1560,7 +1552,7 @@ NT yv Qt sG -uv +tX Wj nf tz @@ -1681,7 +1673,7 @@ EA Wj nf tw -XS +nf KL Jf KO diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.yardbasketball.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.yardbasketball.dmm index ce60474959f..4eed8ea2d7a 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.yardbasketball.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.yardbasketball.dmm @@ -34,7 +34,6 @@ /turf/open/floor/wood, /area/template_noop) "f" = ( -/obj/effect/landmark/corpsespawner/ua_riot, /obj/effect/decal/cleanable/blood, /obj/item/restraint/handcuffs/zip{ pixel_y = -12 diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/25.researchprestine.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/25.researchprestine.dmm index 50ae44dab28..9a7b604d783 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/25.researchprestine.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/25.researchprestine.dmm @@ -205,7 +205,6 @@ }, /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/blood/gibs, -/obj/effect/landmark/corpsespawner/prisoner, /turf/open/floor/prison/whitepurple/southeast, /area/template_noop) "wQ" = ( @@ -234,10 +233,6 @@ /obj/effect/decal/cleanable/blood/gibs/limb, /turf/open/floor/prison/whitepurple/northeast, /area/template_noop) -"zY" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison/floorscorched1, -/area/template_noop) "AZ" = ( /obj/effect/decal/cleanable/blood/tracks/footprints, /turf/open/floor/prison/whitepurple/north, @@ -324,7 +319,6 @@ /obj/effect/decal/cleanable/blood/writing{ dir = 6 }, -/obj/effect/landmark/corpsespawner/prisoner, /turf/open/floor/prison/whitepurple/northeast, /area/template_noop) "EX" = ( @@ -384,10 +378,6 @@ }, /turf/open/floor/prison/whitepurple/west, /area/template_noop) -"IJ" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/floorscorched2, -/area/template_noop) "IL" = ( /obj/structure/bed{ icon_state = "abed" @@ -435,10 +425,6 @@ /obj/structure/window/framed/prison/cell, /turf/open/floor/plating/prison, /area/template_noop) -"MV" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/darkpurplefull2, -/area/template_noop) "MY" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/prison/darkpurplefull2, @@ -511,10 +497,6 @@ /obj/effect/decal/cleanable/blood/tracks/footprints, /turf/open/floor/prison/whitepurple, /area/template_noop) -"SS" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/turf/open/floor/prison/whitepurple/north, -/area/template_noop) "Tj" = ( /turf/open/floor/prison/whitepurple/southwest, /area/template_noop) @@ -597,7 +579,7 @@ mh FA Mo mU -IJ +uU Gk LM ZS @@ -716,7 +698,7 @@ BP ZS Bd el -zY +lA Ed sq el @@ -908,7 +890,7 @@ RH el lA JI -MV +Ot "} (18,1,1) = {" bz @@ -1036,7 +1018,7 @@ LM oc Oh LM -SS +mU Qy RY LM diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/30.pizzatime.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/30.pizzatime.dmm index 0ad96220d8e..cab86fb8f57 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/30.pizzatime.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/30.pizzatime.dmm @@ -100,10 +100,6 @@ /obj/item/reagent_container/food/snacks/grown/tomato, /turf/open/floor/prison/kitchen, /area/template_noop) -"o" = ( -/obj/effect/landmark/corpsespawner/pizza/burst, -/turf/open/floor/prison/kitchen, -/area/template_noop) "p" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/cans/dr_gibb{ @@ -382,7 +378,7 @@ T (6,1,1) = {" z k -o +L C T m diff --git a/maps/map_files/FOP_v3_Sciannex/standalone/riot_in_progress.dmm b/maps/map_files/FOP_v3_Sciannex/standalone/riot_in_progress.dmm index 44c403d021f..92bbf7d6a97 100644 --- a/maps/map_files/FOP_v3_Sciannex/standalone/riot_in_progress.dmm +++ b/maps/map_files/FOP_v3_Sciannex/standalone/riot_in_progress.dmm @@ -181,10 +181,6 @@ /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, /area/fiorina/station/security) -"hg" = ( -/obj/effect/landmark/corpsespawner/security/marshal, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/security) "hI" = ( /obj/item/stack/folding_barricade, /turf/open/floor/prison/floor_plate, @@ -312,7 +308,6 @@ /area/fiorina/station/security) "mt" = ( /obj/effect/spawner/random/gun/shotgun/midchance, -/obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison, /area/fiorina/station/security) "mD" = ( @@ -413,7 +408,6 @@ /turf/open/floor/prison, /area/fiorina/lz/near_lzII) "pV" = ( -/obj/effect/landmark/corpsespawner/prisoner, /obj/item/tool/kitchen/utensil/knife, /turf/open/floor/prison/floor_plate, /area/fiorina/station/security) @@ -578,10 +572,6 @@ /obj/item/clothing/head/helmet/marine/veteran/ua_riot, /turf/open/floor/prison, /area/fiorina/station/security) -"wW" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison, -/area/fiorina/station/security) "xp" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_29"; @@ -806,7 +796,6 @@ /turf/open/floor/prison/redfull, /area/fiorina/station/security) "FQ" = ( -/obj/effect/landmark/corpsespawner/ua_riot, /obj/item/weapon/gun/energy/taser, /turf/open/floor/prison, /area/fiorina/station/security) @@ -970,7 +959,6 @@ /turf/open/floor/prison, /area/fiorina/lz/near_lzII) "OV" = ( -/obj/effect/landmark/corpsespawner/prisoner, /obj/effect/decal/cleanable/blood, /turf/open/floor/prison, /area/fiorina/lz/near_lzII) @@ -1239,7 +1227,6 @@ /turf/open/floor/prison/redfull, /area/fiorina/station/security) "YZ" = ( -/obj/effect/landmark/corpsespawner/prisoner, /obj/structure/bed/chair/comfy{ dir = 8 }, @@ -1404,7 +1391,7 @@ vq vq vq qQ -wW +sq sq sq FH @@ -1476,7 +1463,7 @@ FH bm Su YH -hg +FH PA sq sq @@ -1645,7 +1632,7 @@ Sm nD IG xW -wW +sq sq sq sq diff --git a/maps/map_files/Ice_Colony_v1/Ice_Colony_v1.dmm b/maps/map_files/Ice_Colony_v1/Ice_Colony_v1.dmm index d6d8579e609..929a0afb728 100644 --- a/maps/map_files/Ice_Colony_v1/Ice_Colony_v1.dmm +++ b/maps/map_files/Ice_Colony_v1/Ice_Colony_v1.dmm @@ -1428,7 +1428,6 @@ "cui" = ( /obj/structure/machinery/optable, /obj/effect/landmark/xeno_spawn, -/obj/effect/landmark/corpsespawner/colonist/random/burst, /turf/open/floor/engine, /area/ice_colony/underground/research/sample) "cux" = ( diff --git a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm index 948425489ec..d20d4ef6148 100644 --- a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm +++ b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm @@ -1839,10 +1839,6 @@ }, /turf/open/auto_turf/snow/layer2, /area/ice_colony/exterior/surface/valley/southeast) -"anG" = ( -/obj/effect/landmark/corpsespawner/miner, -/turf/open/floor/plating, -/area/ice_colony/surface/mining) "anH" = ( /obj/structure/surface/table, /obj/effect/landmark/crap_item, @@ -2354,12 +2350,12 @@ /area/ice_colony/surface/dorms) "asu" = ( /obj/structure/closet/cabinet, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /turf/open/floor/wood, /area/ice_colony/surface/dorms) "asx" = ( /obj/structure/closet/cabinet, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /obj/effect/landmark/good_item, /turf/open/floor/wood, /area/ice_colony/surface/dorms) @@ -2427,7 +2423,7 @@ /area/ice_colony/exterior/surface/clearing/pass) "atm" = ( /obj/structure/closet/cabinet, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /obj/effect/landmark/crap_item, /turf/open/floor/wood, /area/ice_colony/surface/dorms) @@ -2519,7 +2515,6 @@ /turf/open/floor/grass, /area/ice_colony/surface/hydroponics/lobby) "atS" = ( -/obj/effect/landmark/corpsespawner/miner, /obj/effect/decal/cleanable/blood, /turf/open/floor/wood, /area/ice_colony/surface/dorms) @@ -2643,7 +2638,6 @@ /turf/open/auto_turf/snow/layer3, /area/ice_colony/exterior/surface/clearing/south) "avw" = ( -/obj/effect/landmark/corpsespawner/engineer, /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/snow/layer3, /area/ice_colony/exterior/surface/clearing/south) @@ -2857,7 +2851,7 @@ "awT" = ( /obj/structure/closet/cabinet, /obj/item/storage/toolbox/emergency, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /turf/open/floor/wood, /area/ice_colony/surface/dorms) "awU" = ( @@ -4048,7 +4042,6 @@ /obj/effect/decal/cleanable/blood{ layer = 3 }, -/obj/effect/landmark/corpsespawner/bridgeofficer, /turf/open/floor/wood, /area/ice_colony/surface/command/crisis) "aIO" = ( @@ -4078,7 +4071,6 @@ /obj/effect/decal/cleanable/blood{ layer = 3 }, -/obj/effect/landmark/corpsespawner/doctor, /turf/open/floor/wood, /area/ice_colony/surface/command/crisis) "aIX" = ( @@ -8346,7 +8338,6 @@ /obj/structure/bed/chair/wood/normal{ dir = 8 }, -/obj/effect/landmark/corpsespawner/engineer, /obj/effect/decal/cleanable/blood, /turf/open/floor/carpet, /area/ice_colony/underground/crew/leisure) @@ -10876,7 +10867,6 @@ icon_state = "3" }, /obj/structure/pipes/standard/simple/hidden/green, -/obj/effect/landmark/corpsespawner/engineer, /turf/open/floor/dark2, /area/ice_colony/surface/engineering) "dYB" = ( @@ -11966,7 +11956,6 @@ /turf/open/floor/darkyellow2/north, /area/ice_colony/underground/engineering/locker) "frz" = ( -/obj/effect/landmark/corpsespawner/doctor, /obj/effect/decal/cleanable/blood{ layer = 3 }, @@ -13390,7 +13379,6 @@ /turf/open/floor/dark2, /area/ice_colony/surface/hangar/alpha) "hhs" = ( -/obj/effect/landmark/corpsespawner/miner, /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/icefloor/warnplate, /area/ice_colony/surface/requesitions) @@ -13743,7 +13731,6 @@ /turf/open/floor/whitered/east, /area/ice_colony/underground/medical/treatment) "hCh" = ( -/obj/effect/landmark/corpsespawner/bridgeofficer, /obj/effect/decal/cleanable/blood{ layer = 3 }, @@ -16685,7 +16672,6 @@ /obj/effect/decal/cleanable/blood{ layer = 3 }, -/obj/effect/landmark/corpsespawner/russian, /turf/open/floor/darkred2/west, /area/ice_colony/surface/command/checkpoint) "lni" = ( @@ -17453,7 +17439,6 @@ /obj/structure/machinery/shower{ dir = 8 }, -/obj/effect/landmark/corpsespawner/bridgeofficer, /obj/effect/decal/cleanable/blood, /turf/open/floor/freezerfloor, /area/ice_colony/surface/dorms/restroom_e) @@ -17645,7 +17630,6 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/obj/effect/landmark/corpsespawner/russian, /obj/effect/decal/cleanable/blood, /turf/open/floor/dark2, /area/ice_colony/underground/security/armory) @@ -17848,7 +17832,6 @@ /turf/open/floor/dark2, /area/ice_colony/surface/hangar/hallway) "mGR" = ( -/obj/effect/landmark/corpsespawner/russian, /obj/effect/decal/cleanable/blood, /turf/open/floor/dark2, /area/ice_colony/underground/research) @@ -19900,7 +19883,6 @@ "psM" = ( /obj/structure/bed, /obj/item/bedsheet/medical, -/obj/effect/landmark/corpsespawner/scientist, /obj/structure/machinery/light/small{ dir = 8 }, @@ -21584,7 +21566,6 @@ /area/ice_colony/surface/dorms/canteen) "rtt" = ( /obj/structure/bed, -/obj/effect/landmark/corpsespawner/prisoner, /obj/effect/decal/cleanable/blood, /turf/open/floor/darkyellow2/northeast, /area/ice_colony/underground/security/brig) @@ -21905,7 +21886,6 @@ /obj/structure/pipes/vents/pump{ dir = 1 }, -/obj/effect/landmark/corpsespawner/miner, /turf/open/floor/freezerfloor, /area/ice_colony/surface/bar/bar) "rSz" = ( @@ -26179,7 +26159,6 @@ /area/ice_colony/underground/crew/morgue) "wUW" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/scientist, /turf/open/floor/dark2, /area/ice_colony/underground/hallway/south_east) "wVY" = ( @@ -26352,7 +26331,6 @@ /obj/structure/machinery/light/small{ dir = 1 }, -/obj/effect/landmark/corpsespawner/miner, /obj/effect/decal/cleanable/blood, /turf/open/floor/white, /area/ice_colony/underground/reception/toilet_men) @@ -26781,7 +26759,6 @@ /area/ice_colony/underground/hallway/north_west) "xGV" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/scientist, /turf/open/floor/white, /area/ice_colony/surface/clinic/treatment) "xHf" = ( @@ -84501,7 +84478,7 @@ alE oJQ amb amb -anG +amb aog aoO amb diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm index d18741ffd18..5a58305af03 100644 --- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm +++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm @@ -1074,10 +1074,6 @@ }, /turf/open/floor/shiva/red/north, /area/shiva/interior/colony/medseceng) -"akr" = ( -/obj/effect/landmark/corpsespawner/miner, -/turf/open/floor/plating, -/area/shiva/interior/colony/medseceng) "aks" = ( /obj/structure/surface/table, /obj/effect/landmark/crap_item, @@ -1870,7 +1866,6 @@ /turf/open/asphalt/cement, /area/shiva/interior/warehouse) "auu" = ( -/obj/effect/landmark/corpsespawner/engineer, /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/snow/layer3, /area/shiva/interior/caves/cp_camp) @@ -2119,7 +2114,6 @@ /obj/effect/decal/cleanable/blood{ layer = 3 }, -/obj/effect/landmark/corpsespawner/security, /turf/open/floor/wood, /area/shiva/interior/colony/s_admin) "aAK" = ( @@ -2663,7 +2657,6 @@ /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/junkyard/cp_bar) "aMl" = ( -/obj/effect/landmark/corpsespawner/engineer, /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard/cp_bar) @@ -3947,10 +3940,6 @@ /obj/structure/machinery/light/double, /turf/open/floor/shiva/wred, /area/shiva/interior/colony/medseceng) -"bsw" = ( -/obj/effect/landmark/corpsespawner/bridgeofficer, -/turf/open/auto_turf/snow/layer0, -/area/shiva/exterior/cp_lz2) "bsC" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -4572,11 +4561,6 @@ "cdH" = ( /turf/open/floor/darkgreen2/northwest, /area/shiva/interior/colony/botany) -"cep" = ( -/obj/structure/surface/table, -/obj/effect/landmark/corpsespawner/scientist, -/turf/open/floor/shiva/floor3, -/area/shiva/interior/colony/research_hab) "cex" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -5909,10 +5893,6 @@ }, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_s_research) -"dBt" = ( -/obj/effect/landmark/corpsespawner/security/marshal, -/turf/open/floor/shiva/green/southeast, -/area/shiva/interior/colony/botany) "dBD" = ( /obj/item/clothing/under/rank/janitor, /turf/open/floor/shiva/bluefull/west, @@ -6485,7 +6465,6 @@ /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard) "enG" = ( -/obj/effect/landmark/corpsespawner/miner, /obj/effect/decal/cleanable/blood, /obj/structure/machinery/light/small{ dir = 4 @@ -8333,7 +8312,7 @@ "gxW" = ( /obj/structure/closet/cabinet, /obj/item/storage/toolbox/emergency, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /turf/open/floor/wood, /area/shiva/interior/colony/botany) "gyu" = ( @@ -8398,7 +8377,6 @@ "gBq" = ( /obj/structure/bed, /obj/item/bedsheet/medical, -/obj/effect/landmark/corpsespawner/scientist, /obj/structure/machinery/light/small{ dir = 8 }, @@ -9927,7 +9905,6 @@ /area/shiva/interior/bar) "iji" = ( /obj/effect/decal/cleanable/blood/gibs/core, -/obj/effect/landmark/corpsespawner/wygoon, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/colony/central) "ijA" = ( @@ -10401,7 +10378,6 @@ /turf/open/floor/shiva/wred/west, /area/shiva/interior/colony/medseceng) "iLR" = ( -/obj/effect/landmark/corpsespawner/doctor, /obj/effect/decal/cleanable/blood{ layer = 3 }, @@ -11199,7 +11175,6 @@ /turf/open/floor/shiva/floor3, /area/shiva/interior/aerodrome) "jBl" = ( -/obj/effect/landmark/corpsespawner/security, /obj/effect/decal/cleanable/blood, /turf/open/floor/shiva/redfull/west, /area/shiva/interior/colony/medseceng) @@ -11391,7 +11366,6 @@ /obj/effect/decal/cleanable/blood{ layer = 3 }, -/obj/effect/landmark/corpsespawner/doctor, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/s_admin) "jMk" = ( @@ -13960,7 +13934,6 @@ /area/shiva/interior/colony/research_hab) "muq" = ( /obj/structure/bed, -/obj/effect/landmark/corpsespawner/prisoner, /obj/effect/decal/cleanable/blood, /turf/open/floor/shiva/redfull/west, /area/shiva/interior/colony/medseceng) @@ -14417,10 +14390,6 @@ /obj/structure/surface/rack, /turf/open/asphalt/cement, /area/shiva/interior/warehouse) -"mRk" = ( -/obj/effect/landmark/corpsespawner/colonist/random, -/turf/open/floor/shiva/bluefull, -/area/shiva/interior/colony/central) "mRo" = ( /obj/structure/platform/strata{ dir = 1 @@ -16773,7 +16742,6 @@ /obj/effect/decal/cleanable/blood/drip{ icon_state = "3" }, -/obj/effect/landmark/corpsespawner/engineer, /turf/open/floor/shiva/yellow/northeast, /area/shiva/interior/colony/medseceng) "pMV" = ( @@ -16800,7 +16768,7 @@ /area/shiva/exterior/cp_lz2) "pNy" = ( /obj/structure/closet/cabinet, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /turf/open/floor/wood, /area/shiva/interior/colony/botany) "pOb" = ( @@ -16964,7 +16932,7 @@ /area/shiva/interior/caves/cp_camp) "pWw" = ( /obj/structure/closet/cabinet, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /obj/effect/landmark/good_item, /turf/open/floor/wood, /area/shiva/interior/colony/botany) @@ -17815,10 +17783,6 @@ }, /turf/open/floor/shiva/yellow, /area/shiva/interior/garage) -"qUU" = ( -/obj/effect/landmark/corpsespawner/colonist/random, -/turf/open/floor/shiva/floor3, -/area/shiva/interior/colony/central) "qVo" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/pill_bottle/bicaridine, @@ -19613,10 +19577,6 @@ /obj/item/tool/stamp, /turf/open/floor/plating, /area/shiva/interior/colony/n_admin) -"tdY" = ( -/obj/effect/landmark/corpsespawner/colonist/random, -/turf/open/floor/shiva/north, -/area/shiva/interior/colony/central) "tea" = ( /obj/item/tool/crowbar/red, /turf/open/floor/shiva/north, @@ -21821,7 +21781,6 @@ /obj/effect/decal/cleanable/blood{ layer = 3 }, -/obj/effect/landmark/corpsespawner/bridgeofficer, /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/s_admin) "vIy" = ( @@ -22223,7 +22182,6 @@ /area/shiva/exterior/junkyard) "wia" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/scientist, /turf/open/floor/shiva/wredfull, /area/shiva/interior/colony/medseceng) "wje" = ( @@ -22349,7 +22307,7 @@ dir = 8; pixel_y = -5 }, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/botany) @@ -37491,7 +37449,7 @@ vYm vYm vYm vYm -bsw +vYm vYm eni eni @@ -41213,7 +41171,7 @@ rId sKf teS aSl -dBt +chG nUH oXA hFq @@ -41807,7 +41765,7 @@ beQ ffj axz txH -tdY +hzf qMR jhr jhr @@ -42294,7 +42252,7 @@ bfc hzf cPP cPP -qUU +qMR jhr jhr qMR @@ -42779,7 +42737,7 @@ beY gpT axz riL -mRk +jhr xYq jhr jhr @@ -52289,7 +52247,7 @@ oLA hKA mIZ rZt -cep +jTw wZv oLA hKA @@ -56582,7 +56540,7 @@ acT acT acT ajO -akr +ajO lat lat ajO diff --git a/maps/map_files/Ice_Colony_v3/standalone/panic_room_hold.dmm b/maps/map_files/Ice_Colony_v3/standalone/panic_room_hold.dmm index 8a8de2a0f43..17bade13f5e 100644 --- a/maps/map_files/Ice_Colony_v3/standalone/panic_room_hold.dmm +++ b/maps/map_files/Ice_Colony_v3/standalone/panic_room_hold.dmm @@ -121,7 +121,6 @@ /obj/effect/decal/cleanable/blood{ layer = 3 }, -/obj/effect/landmark/corpsespawner/doctor, /turf/open/floor/shiva/multi_tiles/southeast, /area/shiva/interior/bar) "fM" = ( @@ -271,13 +270,6 @@ }, /turf/open/floor/shiva/north, /area/shiva/interior/colony/s_admin) -"lP" = ( -/obj/effect/landmark/corpsespawner/wygoon, -/obj/effect/decal/cleanable/blood{ - layer = 3 - }, -/turf/open/floor/shiva/north, -/area/shiva/interior/colony/s_admin) "lQ" = ( /obj/structure/window/reinforced/tinted{ dir = 8 @@ -387,10 +379,6 @@ }, /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/s_admin) -"qU" = ( -/obj/effect/landmark/corpsespawner/scientist, -/turf/open/floor/shiva/bluefull, -/area/shiva/interior/colony/s_admin) "rM" = ( /obj/structure/barricade/wooden{ dir = 1 @@ -456,7 +444,6 @@ pixel_x = 9; pixel_y = 17 }, -/obj/effect/landmark/corpsespawner/chef, /obj/structure/bed/bedroll, /obj/item/bedsheet/ce, /turf/open/floor/shiva/floor3, @@ -927,7 +914,6 @@ /obj/effect/decal/cleanable/blood{ layer = 3 }, -/obj/effect/landmark/corpsespawner/wysec, /turf/open/floor/wood, /area/shiva/interior/colony/s_admin) "IB" = ( @@ -1551,7 +1537,7 @@ dF tk Kp XP -qU +dF ce ul dF @@ -1620,7 +1606,7 @@ zA do Hx Hx -lP +LF dF Lr Hx diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm index 23ab6fde60c..9b1cc4f69cf 100644 --- a/maps/map_files/Kutjevo/Kutjevo.dmm +++ b/maps/map_files/Kutjevo/Kutjevo.dmm @@ -1303,10 +1303,6 @@ }, /turf/open/floor/kutjevo/colors/orange/tile, /area/kutjevo/interior/complex/Northwest_Security_Checkpoint) -"bUI" = ( -/obj/effect/landmark/corpsespawner/colonist/kutjevo, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/complex_border/med_rec) "bVK" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 9; @@ -3011,7 +3007,6 @@ }, /obj/structure/machinery/optable, /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/colonist/kutjevo/burst, /turf/open/floor/kutjevo/colors/cyan/edge/west, /area/kutjevo/interior/complex/med/operating) "ewL" = ( @@ -3167,10 +3162,6 @@ /obj/item/stack/rods, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/construction) -"eJo" = ( -/obj/effect/landmark/corpsespawner/security/marshal, -/turf/open/floor/kutjevo/colors/orange, -/area/kutjevo/interior/colony_South/power2) "eKL" = ( /obj/structure/flora/bush/ausbushes/grassybush{ pixel_x = 5; @@ -3326,10 +3317,6 @@ "eSP" = ( /turf/open/auto_turf/sand/layer2, /area/kutjevo/interior/complex/botany) -"eTc" = ( -/obj/effect/landmark/corpsespawner/colonist/kutjevo, -/turf/open/floor/kutjevo/colors/green/tile, -/area/kutjevo/interior/complex/botany) "eTj" = ( /obj/structure/blocker/invisible_wall, /turf/open/floor/plating/kutjevo, @@ -3350,10 +3337,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_S_East) -"eWP" = ( -/obj/effect/landmark/corpsespawner/colonist/kutjevo, -/turf/open/floor/kutjevo/multi_tiles, -/area/kutjevo/interior/power) "eXm" = ( /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/interior/complex/botany) @@ -3857,10 +3840,6 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_central) -"fMd" = ( -/obj/effect/landmark/corpsespawner/security/marshal, -/turf/open/floor/kutjevo/tan, -/area/kutjevo/interior/construction) "fNo" = ( /obj/structure/platform_decoration/kutjevo{ dir = 8 @@ -4206,7 +4185,6 @@ /area/kutjevo/interior/complex/botany) "gqX" = ( /obj/structure/bed/bedroll, -/obj/effect/landmark/corpsespawner/colonist/kutjevo, /obj/effect/decal/cleanable/blood/splatter, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/spring) @@ -4779,10 +4757,6 @@ /obj/structure/largecrate, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/exterior/lz_pad) -"hkq" = ( -/obj/effect/landmark/corpsespawner/wygoon, -/turf/open/floor/kutjevo/tan, -/area/kutjevo/interior/construction) "hku" = ( /obj/structure/platform/kutjevo/smooth{ dir = 4 @@ -5425,10 +5399,6 @@ "ijO" = ( /turf/open/gm/river/desert/shallow_edge/east, /area/kutjevo/exterior/runoff_river) -"ilS" = ( -/obj/effect/landmark/corpsespawner/colonist/kutjevo, -/turf/open/floor/kutjevo/multi_tiles/east, -/area/kutjevo/exterior/runoff_bridge) "inR" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 6 @@ -6387,10 +6357,6 @@ /obj/structure/platform/kutjevo/rock, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/scrubland) -"jFr" = ( -/obj/effect/landmark/corpsespawner/wygoon, -/turf/open/floor/kutjevo/colors/purple/edge/north, -/area/kutjevo/interior/construction) "jFB" = ( /obj/item/stack/sheet/wood, /turf/open/floor/kutjevo/tan/multi_tiles, @@ -7491,10 +7457,6 @@ "lkC" = ( /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/med/auto_doc) -"lkP" = ( -/obj/effect/landmark/corpsespawner/colonist/kutjevo, -/turf/open/gm/river/desert/deep/covered, -/area/kutjevo/interior/power/comms) "llg" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/auto_turf/sand/layer0, @@ -8394,10 +8356,6 @@ /obj/structure/largecrate/random, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany/east_tech) -"mCf" = ( -/obj/effect/landmark/corpsespawner/wygoon, -/turf/open/floor/kutjevo/colors/cyan/tile, -/area/kutjevo/interior/complex/med/operating) "mCI" = ( /obj/structure/prop/dam/crane{ icon_state = "tractor"; @@ -8835,10 +8793,6 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_dunes) -"njQ" = ( -/obj/effect/landmark/corpsespawner/security/marshal, -/turf/open/floor/kutjevo/tan/multi_tiles, -/area/kutjevo/interior/complex/botany/east) "njY" = ( /obj/structure/platform_decoration/kutjevo/rock{ dir = 4 @@ -8920,7 +8874,6 @@ /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/complex_border/med_rec) "nsk" = ( -/obj/effect/landmark/corpsespawner/wygoon, /turf/open/floor/kutjevo/colors/cyan/inner_corner/west, /area/kutjevo/interior/complex/med/operating) "nsU" = ( @@ -9975,7 +9928,6 @@ pixel_y = 22; range = 15 }, -/obj/effect/landmark/corpsespawner/wygoon, /turf/open/floor/kutjevo/tan/grey_edge/north, /area/kutjevo/interior/complex/med) "oNG" = ( @@ -10617,10 +10569,6 @@ /obj/item/clothing/suit/armor/vest/security, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/complex_border/botany_medical_cave) -"pLS" = ( -/obj/effect/landmark/corpsespawner/wygoon, -/turf/open/floor/kutjevo/colors/red, -/area/kutjevo/interior/complex/botany) "pMw" = ( /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/med/locks) @@ -11951,10 +11899,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/auto_turf/sand/layer2, /area/kutjevo/interior/colony_S_East) -"scY" = ( -/obj/effect/landmark/corpsespawner/wygoon, -/turf/open/floor/kutjevo/tan, -/area/kutjevo/interior/complex/botany) "sdn" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 4; @@ -13141,7 +13085,6 @@ /obj/structure/barricade/wooden{ dir = 4 }, -/obj/effect/landmark/corpsespawner/wygoon, /turf/open/floor/kutjevo/multi_tiles/east, /area/kutjevo/interior/complex/botany) "tOe" = ( @@ -15142,10 +15085,6 @@ }, /turf/open/floor/almayer/research/containment/floor2, /area/kutjevo/interior/complex/med/auto_doc) -"wLt" = ( -/obj/effect/landmark/corpsespawner/colonist/kutjevo, -/turf/open/floor/kutjevo/grey/plate, -/area/kutjevo/interior/construction) "wMw" = ( /obj/structure/blocker/invisible_wall, /turf/open/floor/kutjevo/multi_tiles, @@ -15919,11 +15858,6 @@ icon_state = "pwall" }, /area/kutjevo/interior/oob) -"yce" = ( -/obj/structure/blocker/invisible_wall, -/obj/effect/landmark/corpsespawner/security/marshal, -/turf/open/gm/river/desert/deep/toxic, -/area/kutjevo/interior/power) "ycq" = ( /obj/item/prop/alien/hugger, /turf/open/floor/kutjevo/tan, @@ -22400,7 +22334,7 @@ lUg ixA hQj hQj -eWP +hQj hQj hQj hWX @@ -23354,7 +23288,7 @@ tlN tlN tlN scu -lkP +tXm wqD adX tlN @@ -23687,7 +23621,7 @@ sYd gzv ezX fYp -lkP +tXm esi tXm fYp @@ -24067,7 +24001,7 @@ rwj wMw wMw wMw -yce +hBj xyQ byl vFv @@ -25574,7 +25508,7 @@ hQj ftY iLE loI -eWP +hQj akH pBV hbK @@ -31032,7 +30966,7 @@ vDS vDS vDS vDS -scY +kDS lfm vDS lHs @@ -31204,7 +31138,7 @@ ezJ uhV qhw nOG -eTc +nOG tKY sbX tKY @@ -32138,7 +32072,7 @@ iaR bIT kkH gVV -mCf +bKl cbg qvK gRi @@ -32205,10 +32139,10 @@ kDS cAt cAt cAt -scY +kDS wnw lry -ilS +qQq jiz cqX fyD @@ -33207,7 +33141,7 @@ xIJ gAy tRp pSs -pLS +pSs tRp brL kDS @@ -34877,7 +34811,7 @@ iSO nCM kDS kDS -scY +kDS kif fiE fyD @@ -35198,7 +35132,7 @@ yir xkk xkk hqA -njQ +xkk hqA xkk jnS @@ -36668,7 +36602,7 @@ gld msK msK uAz -bUI +gld rES aAg gof @@ -37485,10 +37419,10 @@ sbz oUP sBh fyF -wLt +fyF alo qAF -hkq +euj dKO euj euj @@ -37988,9 +37922,9 @@ fyF fyF lxc kFF -jFr +qAF +euj euj -fMd ssj euj euj @@ -37999,7 +37933,7 @@ dOJ twn ylf anE -bUI +gld gld gld msK @@ -40712,7 +40646,7 @@ qGx duw qGx qGx -eJo +qGx qGx qGx qGx @@ -41025,7 +40959,7 @@ dQv xWK qaI cUm -wLt +fyF cUm lxc eTT diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index e957d358318..d38bbca6dce 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -1,11 +1,4 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aaP" = ( -/obj/item/prop/helmetgarb/lucky_feather{ - pixel_x = 11; - pixel_y = 10 - }, -/turf/open/floor/corsat/plate, -/area/lv522/oob) "aaR" = ( /obj/structure/prop/invuln/overhead/flammable_pipe/fly{ dir = 10; @@ -149,9 +142,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) -"adz" = ( -/turf/open/floor/corsat/brown/southwest, -/area/lv522/oob) "adA" = ( /obj/structure/largecrate/random, /obj/effect/decal/cleanable/dirt, @@ -365,20 +355,6 @@ /obj/effect/decal/cleanable/mucus, /turf/open/floor/strata/white_cyan3/north, /area/lv522/indoors/a_block/medical) -"ahZ" = ( -/obj/structure/closet/crate, -/obj/item/clothing/under/colonist, -/obj/item/clothing/under/colonist, -/obj/item/clothing/under/colonist, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/suit/storage/apron/overalls, -/obj/item/clothing/suit/storage/apron/overalls, -/obj/item/clothing/suit/storage/apron/overalls, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison, -/area/lv522/indoors/c_block/mining) "aij" = ( /obj/structure/stairs/perspective{ dir = 10; @@ -984,6 +960,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement/cement1, /area/lv522/outdoors/colony_streets/north_street) +"axg" = ( +/obj/docking_port/stationary/marine_dropship/lz2{ + name = "LZ2: Southeast Landing Zone" + }, +/turf/open/floor/plating, +/area/lv522/landing_zone_2) "axr" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -1129,6 +1111,13 @@ /obj/item/prop/colony/canister, /turf/open/floor/corsat/squares, /area/lv522/atmos/cargo_intake) +"aBK" = ( +/obj/item/prop/alien/hugger{ + pixel_x = -7; + pixel_y = -5 + }, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/north_street) "aBM" = ( /obj/structure/platform{ dir = 1 @@ -1351,13 +1340,6 @@ /obj/item/stool, /turf/open/floor/strata/white_cyan1, /area/lv522/indoors/lone_buildings/chunk) -"aIf" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/closet/crate/weapon, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/security) "aIr" = ( /turf/closed/shuttle/elevator{ dir = 5 @@ -1751,11 +1733,6 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/corsat/plate, /area/lv522/atmos/reactor_garage) -"aRX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/blue/west, -/area/lv522/indoors/a_block/admin) "aSb" = ( /obj/structure/girder, /obj/structure/pipes/standard/simple/hidden/green, @@ -1781,6 +1758,10 @@ /obj/item/trash/plate, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms) +"aSF" = ( +/obj/effect/spawner/gibspawner/human, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/w_rockies) "aST" = ( /obj/structure/prop/invuln/overhead/flammable_pipe/fly{ dir = 8; @@ -1975,6 +1956,11 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/garden_bridge) +"aXF" = ( +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/north_street) "aXH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/computer/telecomms/server{ @@ -2194,6 +2180,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/garage) +"bdR" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/north_west_street) "bdU" = ( /obj/structure/closet/crate, /obj/structure/machinery/light{ @@ -2282,10 +2272,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/white_cyan4/north, /area/lv522/indoors/a_block/medical) -"bfR" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/w_rockies) "bgc" = ( /turf/open/floor/plating, /area/lv522/atmos/cargo_intake) @@ -3370,12 +3356,6 @@ "bIr" = ( /turf/open/floor/corsat, /area/lv522/atmos/east_reactor/north) -"bIt" = ( -/obj/structure/noticeboard{ - pixel_y = 29 - }, -/turf/open/floor/prison/blue_plate/north, -/area/lv522/indoors/a_block/hallway) "bIw" = ( /obj/item/stack/rods, /obj/effect/decal/cleanable/dirt, @@ -3520,12 +3500,18 @@ }, /turf/open/floor/wood, /area/lv522/indoors/a_block/fitness/glass) -"bNy" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/colonist/burst, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/corsat/brown/west, -/area/lv522/atmos/east_reactor/south) +"bNo" = ( +/obj/structure/surface/rack, +/obj/item/clothing/under/colonist/boilersuit/cyan, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/camera/autoname{ + dir = 8 + }, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/prison/darkpurplefull2, +/area/lv522/indoors/a_block/dorms/glass) "bNE" = ( /obj/item/tank/oxygen{ pixel_x = 4; @@ -3638,12 +3624,6 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_street) -"bQc" = ( -/obj/structure/machinery/power/apc/power/north{ - start_charge = 20 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/admin) "bQv" = ( /obj/structure/surface/rack, /obj/structure/machinery/light, @@ -4282,10 +4262,6 @@ "cex" = ( /turf/open/auto_turf/shale/layer2, /area/lv522/landing_zone_2) -"ceE" = ( -/obj/item/prop/colony/used_flare, -/turf/open/floor/prison/blue/northeast, -/area/lv522/indoors/a_block/admin) "ceG" = ( /obj/structure/closet/crate/trashcart, /obj/item/trash/chips, @@ -4528,15 +4504,6 @@ }, /turf/open/floor/prison/floor_marked/southwest, /area/lv522/indoors/lone_buildings/storage_blocks) -"ckz" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/prison/darkredfull2, -/area/lv522/outdoors/colony_streets/north_street) "ckE" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp, @@ -4825,6 +4792,10 @@ }, /turf/open/floor/whiteyellowfull/east, /area/lv522/oob/w_y_vault) +"csK" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/prison/blue_plate/north, +/area/lv522/indoors/a_block/admin) "csU" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -4920,11 +4891,6 @@ "cvi" = ( /turf/open/floor/plating, /area/lv522/indoors/a_block/security) -"cvM" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/colonist/burst, -/turf/open/floor/corsat/brown, -/area/lv522/atmos/east_reactor/south) "cvT" = ( /obj/structure/surface/rack, /obj/item/clothing/head/hardhat/dblue{ @@ -4934,6 +4900,17 @@ /obj/item/clothing/head/hardhat/white, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor) +"cvY" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1; + pixel_y = -1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/atmos/way_in_command_centre) "cwt" = ( /obj/structure/window/framed/strata/reinforced, /obj/structure/pipes/standard/simple/hidden/green, @@ -5258,21 +5235,10 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"cEj" = ( -/obj/structure/closet/crate, -/obj/item/clothing/under/colonist, -/obj/item/clothing/under/colonist, -/obj/item/clothing/under/colonist, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/suit/storage/apron/overalls, -/obj/item/clothing/suit/storage/apron/overalls, -/obj/item/clothing/suit/storage/apron/overalls, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/prison, -/area/lv522/indoors/c_block/mining) +"cDX" = ( +/obj/item/prop/colony/used_flare, +/turf/open/floor/prison/blue/northeast, +/area/lv522/indoors/a_block/admin) "cEr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_plate, @@ -5300,16 +5266,6 @@ /obj/structure/machinery/light, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) -"cEJ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/prison/darkredfull2, -/area/lv522/outdoors/colony_streets/north_street) "cEO" = ( /obj/structure/machinery/disposal, /turf/open/floor/prison/blue_plate/north, @@ -5515,12 +5471,6 @@ }, /turf/open/floor/corsat/brown/southwest, /area/lv522/atmos/cargo_intake) -"cMJ" = ( -/obj/item/shard{ - icon_state = "medium" - }, -/turf/open/floor/prison/blue/north, -/area/lv522/indoors/a_block/admin) "cMO" = ( /obj/structure/closet/crate, /obj/item/ore/silver, @@ -5590,6 +5540,16 @@ "cNV" = ( /turf/closed/wall/strata_outpost, /area/lv522/atmos/north_command_centre) +"cOh" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/oob) "cOs" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -5721,12 +5681,6 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/atmos/east_reactor/south) -"cSJ" = ( -/obj/docking_port/stationary/marine_dropship/lz2{ - name = "LZ2: Southeast Landing Zone" - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_2) "cSO" = ( /turf/open/floor/plating, /area/lv522/indoors/c_block/garage) @@ -6281,6 +6235,12 @@ }, /turf/open/floor/corsat/brown/north, /area/lv522/atmos/east_reactor) +"dhy" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/plate, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/blue_plate/north, +/area/lv522/indoors/a_block/admin) "dhP" = ( /obj/structure/machinery/landinglight/ds1/delayone{ dir = 8 @@ -6311,9 +6271,6 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/atmos/sewer) -"diN" = ( -/turf/open/asphalt/cement/cement1, -/area/lv522/oob) "dja" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison/blue/east, @@ -6528,6 +6485,13 @@ }, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/east) +"dnp" = ( +/obj/effect/spawner/gibspawner/human, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/prison/darkpurple2/north, +/area/lv522/indoors/a_block/dorms) "dnH" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/diamond{ @@ -7068,11 +7032,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/squares, /area/lv522/atmos/east_reactor/east) -"dBn" = ( -/obj/effect/spawner/gibspawner/xeno, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/north_street) "dBu" = ( /obj/structure/machinery/light{ dir = 1 @@ -7622,13 +7581,6 @@ /obj/effect/decal/cleanable/blood/xeno, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/nw_rockies) -"dRm" = ( -/obj/effect/decal/hefa_cult_decals/d32{ - desc = "You think you can make out the iconography of a Xenomorph."; - icon_state = "2" - }, -/turf/open/floor/corsat/brown/west, -/area/lv522/oob) "dRL" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/a_block/dorm_north) @@ -7640,6 +7592,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/corsat/plate, /area/lv522/atmos/filt) +"dRV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/indoors/a_block/admin) "dRX" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -7809,12 +7766,6 @@ /obj/structure/cargo_container/kelland/left, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_east_street) -"dWI" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/prison/blue/north, -/area/lv522/indoors/a_block/hallway) "dWU" = ( /obj/structure/machinery/computer/operating, /obj/structure/surface/table/reinforced/prison, @@ -7895,12 +7846,6 @@ /obj/structure/largecrate/random/mini/wooden, /turf/open/floor/prison/greenfull/east, /area/lv522/indoors/a_block/fitness) -"dYY" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/plate, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/blue_plate/north, -/area/lv522/indoors/a_block/admin) "dZc" = ( /obj/structure/surface/table/almayer, /turf/open/floor/strata/blue1, @@ -8464,17 +8409,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat/brown/west, /area/lv522/atmos/cargo_intake) -"erW" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin{ - pixel_y = 5 - }, -/obj/item/tool/pen/blue/clicky, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/xeno_spawn, -/obj/effect/landmark/corpsespawner/colonist/burst, -/turf/open/floor/corsat/plate, -/area/lv522/atmos/east_reactor/south) "esa" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, @@ -8975,13 +8909,6 @@ }, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) -"eDv" = ( -/obj/effect/spawner/gibspawner/human, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/prison/darkpurple2/north, -/area/lv522/indoors/a_block/dorms) "eDw" = ( /obj/structure/filingcabinet/seeds{ density = 0; @@ -9035,6 +8962,14 @@ "eEp" = ( /turf/open/asphalt/cement/cement1, /area/lv522/outdoors/colony_streets/north_east_street) +"eET" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/corsat/plate, +/area/lv522/atmos/east_reactor/south) "eEY" = ( /turf/open/asphalt/cement/cement14, /area/lv522/outdoors/colony_streets/south_east_street) @@ -9163,16 +9098,6 @@ }, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/mining) -"eIZ" = ( -/obj/effect/decal/hefa_cult_decals/d32{ - desc = "You think you can make out the iconography of a Xenomorph."; - icon_state = "3" - }, -/obj/structure/machinery/computer/cameras/wooden_tv{ - pixel_y = 29 - }, -/turf/open/floor/corsat/brown/north, -/area/lv522/oob) "eJm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed{ @@ -9562,6 +9487,11 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_west_street) +"eUD" = ( +/obj/structure/surface/rack, +/obj/item/clothing/under/colonist/boilersuit/cyan, +/turf/open/floor/prison/darkpurplefull2, +/area/lv522/indoors/a_block/dorms/glass) "eUL" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -10163,10 +10093,6 @@ /obj/structure/machinery/light, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) -"fkB" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/nw_rockies) "fkD" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/auto_turf/shale/layer2, @@ -10475,10 +10401,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) -"fto" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison, -/area/lv522/outdoors/colony_streets/north_street) "fts" = ( /obj/structure/surface/table/woodentable/fancy, /obj/effect/decal/cleanable/dirt, @@ -10507,6 +10429,10 @@ /obj/structure/bed/chair, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"ftQ" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/w_rockies) "ftT" = ( /obj/structure/safe, /turf/open/floor/prison/darkbrownfull2, @@ -10693,6 +10619,15 @@ "fyE" = ( /turf/open/floor/prison/kitchen, /area/lv522/indoors/b_block/bar) +"fyV" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/prison/darkredfull2, +/area/lv522/outdoors/colony_streets/north_street) "fza" = ( /obj/item/trash/barcardine, /obj/effect/decal/cleanable/dirt, @@ -10815,6 +10750,12 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/atmos/way_in_command_centre) +"fDu" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison/cell_stripe/north, +/area/lv522/atmos/way_in_command_centre) "fDx" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -10884,6 +10825,13 @@ }, /turf/open/floor/corsat/brown, /area/lv522/atmos/east_reactor/north) +"fGt" = ( +/obj/effect/decal/hefa_cult_decals/d32{ + desc = "You think you can make out the iconography of a Xenomorph."; + icon_state = "2" + }, +/turf/open/floor/corsat/brown/west, +/area/lv522/oob) "fGS" = ( /obj/structure/bed/chair, /obj/structure/machinery/light{ @@ -10993,16 +10941,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) -"fLz" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/oob) "fLK" = ( /obj/structure/cryofeed, /obj/structure/prop/invuln/overhead/flammable_pipe/fly{ @@ -11030,13 +10968,6 @@ "fMk" = ( /turf/open/floor/prison/darkpurple2/east, /area/lv522/indoors/a_block/dorms) -"fMy" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/item/stack/sheet/metal, -/turf/open/floor/prison/blue_plate/north, -/area/lv522/indoors/a_block/admin) "fMM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light{ @@ -11594,10 +11525,6 @@ "fZR" = ( /turf/open/floor/corsat/browncorner/west, /area/lv522/atmos/north_command_centre) -"fZX" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/corsat/brown/southeast, -/area/lv522/atmos/east_reactor/south) "gae" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -11708,14 +11635,6 @@ }, /turf/open/floor/corsat/marked, /area/lv522/atmos/reactor_garage) -"gcO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/clothing/under/colonist{ - pixel_x = 5; - pixel_y = -6 - }, -/turf/open/floor/carpet, -/area/lv522/indoors/a_block/executive) "gcU" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -11785,11 +11704,6 @@ /obj/item/clothing/glasses/kutjevo, /turf/open/floor/prison/darkyellowfull2/east, /area/lv522/indoors/lone_buildings/outdoor_bot) -"geo" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/colonist/burst, -/turf/open/floor/corsat/plate, -/area/lv522/atmos/east_reactor/south) "get" = ( /turf/open/floor/carpet, /area/lv522/atmos/east_reactor/east) @@ -11975,16 +11889,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/brown/west, /area/lv522/atmos/east_reactor) -"gkf" = ( -/obj/effect/decal/hefa_cult_decals/d96{ - desc = "You think you can make out the iconography of a Xenomorph?" - }, -/obj/effect/decal/hefa_cult_decals/d32{ - desc = "You think you can make out the iconography of a Xenomorph."; - icon_state = "bee" - }, -/turf/open/floor/corsat/plate, -/area/lv522/oob) "gkh" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -12296,6 +12200,14 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms) +"grG" = ( +/obj/structure/largecrate/random/mini{ + pixel_x = 9; + pixel_y = 12 + }, +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_east_street) "grP" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, @@ -12401,9 +12313,6 @@ }, /turf/open/floor/strata/white_cyan1/east, /area/lv522/indoors/a_block/medical) -"gvq" = ( -/turf/open/floor/plating/platingdmg3/west, -/area/lv522/indoors/a_block/admin) "gvG" = ( /obj/item/toy/beach_ball/holoball, /turf/open/auto_turf/sand_white/layer0, @@ -12679,6 +12588,11 @@ }, /turf/open/floor/prison/blue/north, /area/lv522/indoors/a_block/admin) +"gDv" = ( +/obj/structure/surface/table/almayer, +/obj/item/clothing/accessory/storage/black_vest, +/turf/open/floor/prison/darkredfull2, +/area/lv522/indoors/a_block/security) "gDL" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door_control/brbutton/alt{ @@ -12731,9 +12645,6 @@ }, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/casino) -"gEZ" = ( -/turf/open/floor/corsat/brown/west, -/area/lv522/oob) "gFs" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -13035,12 +12946,6 @@ }, /turf/open/asphalt/cement/cement3, /area/lv522/outdoors/colony_streets/north_west_street) -"gNU" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/prison/cell_stripe/north, -/area/lv522/atmos/way_in_command_centre) "gOj" = ( /obj/structure/cargo_container/horizontal/blue/middle, /turf/open/auto_turf/sand_white/layer0, @@ -13322,10 +13227,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/kitchen, /area/lv522/indoors/a_block/kitchen) -"gTO" = ( -/obj/effect/landmark/corpsespawner/colonist/burst, -/turf/open/floor/corsat/plate, -/area/lv522/atmos/east_reactor/south) "gUi" = ( /obj/structure/flora/jungle/planttop1, /turf/open/floor/grass, @@ -13386,6 +13287,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"gVh" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/north_street) "gVn" = ( /obj/structure/platform_decoration{ dir = 4 @@ -13693,6 +13598,9 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/prison, /area/lv522/outdoors/colony_streets/windbreaker/observation) +"hcG" = ( +/turf/open/floor/corsat/brown/southwest, +/area/lv522/oob) "hcO" = ( /obj/structure/platform_decoration, /turf/open/floor/plating, @@ -13734,12 +13642,6 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_street) -"hem" = ( -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 4 - }, -/turf/open/floor/corsat/plate, -/area/lv522/atmos/east_reactor/south) "her" = ( /obj/structure/stairs/perspective{ dir = 6; @@ -13911,6 +13813,17 @@ "hgP" = ( /turf/open/floor/prison/whitegreenfull/southwest, /area/lv522/oob) +"hht" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison/darkredfull2, +/area/lv522/outdoors/colony_streets/north_street) "hhv" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/brown/north, @@ -14107,6 +14020,11 @@ /obj/structure/cargo_container/watatsumi/leftmid, /turf/open/floor/prison/floor_plate, /area/lv522/outdoors/colony_streets/north_west_street) +"hlP" = ( +/obj/item/prop/alien/hugger, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/kitchen) "hlW" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison/floor_marked/southwest, @@ -14154,6 +14072,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_marked/southwest, /area/lv522/landing_zone_2/ceiling) +"hnx" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/prison/blue/north, +/area/lv522/indoors/a_block/hallway) "hny" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Bedroom" @@ -14255,13 +14179,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/platebotc, /area/lv522/indoors/b_block/hydro/glass) -"hpZ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/atmos/way_in_command_centre) "hqA" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -14813,6 +14730,14 @@ "hJg" = ( /turf/open/asphalt/cement/cement3, /area/lv522/outdoors/colony_streets/north_street) +"hJs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/under/colonist/boilersuit/cyan{ + pixel_x = 5; + pixel_y = -6 + }, +/turf/open/floor/carpet, +/area/lv522/indoors/a_block/executive) "hJG" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 @@ -15039,13 +14964,6 @@ }, /turf/open/floor/prison, /area/lv522/atmos/cargo_intake) -"hPg" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/camera/autoname{ - dir = 4 - }, -/turf/open/floor/prison/blue_plate/north, -/area/lv522/indoors/a_block/admin) "hPp" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -15463,11 +15381,6 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/c_block/cargo) -"icQ" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/corsat/brown/east, -/area/lv522/atmos/east_reactor/south) "icT" = ( /obj/structure/machinery/light{ dir = 1 @@ -15494,11 +15407,6 @@ }, /turf/open/asphalt/cement/cement9, /area/lv522/outdoors/colony_streets/south_east_street) -"idH" = ( -/obj/item/device/flashlight/flare/on, -/obj/effect/decal/cleanable/blood, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/nw_rockies) "idI" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -15608,14 +15516,6 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/atmos/way_in_command_centre) -"igg" = ( -/obj/structure/largecrate/random/mini{ - pixel_x = 9; - pixel_y = 12 - }, -/obj/effect/decal/cleanable/blood/gibs, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/colony_streets/north_east_street) "ign" = ( /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) @@ -16136,10 +16036,6 @@ /obj/vehicle/train/cargo/trolley, /turf/open/floor/corsat/plate, /area/lv522/atmos/filt) -"iwt" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/indoors/a_block/admin) "iwD" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice3"; @@ -16160,6 +16056,12 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"iwM" = ( +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/admin) "iwV" = ( /obj/structure/prop/ice_colony/ground_wire, /obj/structure/prop/ice_colony/ground_wire{ @@ -16187,6 +16089,13 @@ "ixi" = ( /turf/open/asphalt/cement/cement3, /area/lv522/outdoors/colony_streets/north_west_street) +"ixk" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/atmos/way_in_command_centre) "ixp" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/camera/autoname{ @@ -16705,6 +16614,10 @@ }, /turf/open/floor/corsat/plate, /area/lv522/atmos/reactor_garage) +"iNx" = ( +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/w_rockies) "iNA" = ( /obj/item/clothing/shoes/marine/civilian{ name = "steel toe boots" @@ -16929,11 +16842,6 @@ /obj/item/tool/weldingtool, /turf/open/floor/shiva/radiator_tile2, /area/lv522/oob) -"iTF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/indoors/a_block/admin) "iTS" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 10 @@ -17056,11 +16964,6 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"iXA" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/colonist/burst, -/turf/open/floor/corsat/browncorner, -/area/lv522/atmos/east_reactor/south) "iXM" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -17276,6 +17179,16 @@ }, /turf/open/asphalt/cement/cement3, /area/lv522/outdoors/colony_streets/central_streets) +"jef" = ( +/obj/effect/decal/hefa_cult_decals/d32{ + desc = "You think you can make out the iconography of a Xenomorph."; + icon_state = "3" + }, +/obj/structure/machinery/computer/cameras/wooden_tv{ + pixel_y = 29 + }, +/turf/open/floor/corsat/brown/north, +/area/lv522/oob) "jer" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -18132,6 +18045,10 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, /area/lv522/atmos/outdoor) +"jxR" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/indoors/a_block/admin) "jxW" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/browncorner, @@ -18495,6 +18412,13 @@ /obj/structure/largecrate/random/barrel, /turf/open/floor/corsat/plate, /area/lv522/atmos/cargo_intake) +"jEQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 + }, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/kitchen) "jEW" = ( /obj/structure/bed/chair{ dir = 1 @@ -18597,6 +18521,12 @@ /obj/item/prop/colony/used_flare, /turf/open/floor/prison/blue/north, /area/lv522/indoors/a_block/admin) +"jGV" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/corsat/plate, +/area/lv522/atmos/east_reactor/south) "jHb" = ( /turf/open/gm/river, /area/lv522/oob) @@ -18721,6 +18651,13 @@ }, /turf/open/asphalt/cement/cement12, /area/lv522/outdoors/colony_streets/north_east_street) +"jLA" = ( +/obj/effect/decal/hefa_cult_decals/d32{ + desc = "You think you can make out the iconography of a Xenomorph."; + icon_state = "4" + }, +/turf/open/floor/corsat/brown/east, +/area/lv522/oob) "jLF" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -19411,6 +19348,10 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/plating, /area/lv522/oob) +"kcz" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, +/turf/open/floor/corsat/brown, +/area/lv522/atmos/east_reactor/south) "kcC" = ( /obj/structure/prop/ice_colony/ground_wire, /obj/structure/prop/ice_colony/ground_wire{ @@ -19742,13 +19683,6 @@ }, /turf/open/floor/corsat/plate, /area/lv522/atmos/cargo_intake) -"kjQ" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/colonist/burst, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/corsat, -/area/lv522/atmos/east_reactor/south) "kjW" = ( /obj/structure/surface/rack, /obj/item/explosive/plastic, @@ -20246,18 +20180,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/brown, /area/lv522/atmos/east_reactor/north) -"kvn" = ( -/obj/structure/surface/rack, -/obj/item/clothing/under/colonist, -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/camera/autoname{ - dir = 8 - }, -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/prison/darkpurplefull2, -/area/lv522/indoors/a_block/dorms/glass) "kvy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/flour, @@ -20913,19 +20835,6 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating, /area/lv522/indoors/c_block/garage) -"kJY" = ( -/obj/structure/filingcabinet{ - density = 0; - pixel_x = -7; - pixel_y = 19 - }, -/obj/structure/filingcabinet/chestdrawer{ - density = 0; - pixel_x = 8; - pixel_y = 19 - }, -/turf/open/floor/prison/blue_plate/north, -/area/lv522/indoors/a_block/admin) "kKd" = ( /obj/structure/cargo_container/watatsumi/rightmid, /turf/open/floor/prison/floor_marked/southwest, @@ -21494,6 +21403,12 @@ "kXY" = ( /turf/open/floor/prison, /area/lv522/atmos/way_in_command_centre) +"kYf" = ( +/obj/docking_port/stationary/marine_dropship/lz1{ + name = "LZ1: Southwest Landing Zone" + }, +/turf/open/floor/plating, +/area/lv522/landing_zone_1) "kYm" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -21671,12 +21586,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/greenfull/east, /area/lv522/indoors/a_block/fitness) -"ldJ" = ( -/obj/docking_port/stationary/marine_dropship/lz1{ - name = "LZ1: Southwest Landing Zone" - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1) "ldK" = ( /obj/structure/filingcabinet{ density = 0; @@ -21804,6 +21713,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/blue1, /area/lv522/outdoors/colony_streets/windbreaker/observation) +"lik" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/corsat/brown/west, +/area/lv522/atmos/east_reactor/south) "liL" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -21922,22 +21836,6 @@ "lli" = ( /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/fitness) -"lll" = ( -/obj/structure/filingcabinet/chestdrawer{ - density = 0; - pixel_x = 8; - pixel_y = 19 - }, -/obj/structure/filingcabinet{ - density = 0; - pixel_x = -7; - pixel_y = 19 - }, -/obj/item/shard{ - icon_state = "medium" - }, -/turf/open/floor/prison/blue_plate/north, -/area/lv522/indoors/a_block/admin) "llp" = ( /obj/structure/foamed_metal, /turf/open/floor/corsat/plate, @@ -22597,6 +22495,23 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, /area/lv522/outdoors/colony_streets/windbreaker/observation) +"lAi" = ( +/obj/structure/largecrate/random/barrel{ + layer = 2.7 + }, +/obj/structure/largecrate/random/barrel{ + layer = 2.9; + pixel_x = 6; + pixel_y = -16 + }, +/obj/structure/largecrate/random/barrel{ + layer = 2.9; + pixel_x = -17; + pixel_y = -9 + }, +/obj/structure/blocker/invisible_wall, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_west_street) "lAm" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -22743,6 +22658,17 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/atmos/east_reactor/south) +"lEA" = ( +/obj/item/ammo_magazine/sniper{ + current_rounds = 0; + pixel_x = 10; + pixel_y = 12 + }, +/obj/item/ammo_magazine/sniper{ + current_rounds = 1 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "lEI" = ( /obj/item/stack/rods, /obj/structure/machinery/light{ @@ -23527,6 +23453,10 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/casino) +"lXS" = ( +/obj/structure/curtain/medical, +/turf/open/floor/strata/white_cyan2/west, +/area/lv522/indoors/a_block/medical/glass) "lXY" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -23669,6 +23599,16 @@ /obj/item/tool/pen/blue/clicky, /turf/open/floor/corsat/squares, /area/lv522/atmos/east_reactor/east) +"maA" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/prison/darkredfull2, +/area/lv522/outdoors/colony_streets/north_street) "maF" = ( /obj/effect/spawner/gibspawner/xeno, /obj/structure/pipes/standard/simple/hidden/green{ @@ -24060,13 +24000,6 @@ }, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor/south) -"mlM" = ( -/obj/item/prop/alien/hugger{ - pixel_x = 13; - pixel_y = -5 - }, -/turf/open/asphalt/cement/cement3, -/area/lv522/outdoors/colony_streets/north_street) "mlV" = ( /obj/structure/pipes/standard/simple/visible{ dir = 6 @@ -24160,6 +24093,12 @@ }, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/cargo) +"mog" = ( +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/prison/blue/north, +/area/lv522/indoors/a_block/admin) "mok" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -24167,15 +24106,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkredfull2, /area/lv522/outdoors/colony_streets/north_street) -"mon" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1; - pixel_y = -1 - }, -/obj/effect/landmark/corpsespawner/wy/manager, -/turf/open/floor/whiteyellowfull/east, -/area/lv522/oob/w_y_vault) "mox" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -24420,6 +24350,9 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/cargo) +"mvP" = ( +/turf/open/asphalt/cement/cement1, +/area/lv522/oob) "mwm" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -24466,6 +24399,13 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/asphalt/cement/cement9, /area/lv522/outdoors/colony_streets/north_west_street) +"mxl" = ( +/obj/structure/pipes/vents/pump, +/obj/structure/machinery/space_heater/radiator/red{ + dir = 4 + }, +/turf/open/floor/prison/blue_plate/north, +/area/lv522/indoors/a_block/admin) "mxx" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -25143,6 +25083,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/south) +"mMM" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/blue/northwest, +/area/lv522/indoors/a_block/admin) "mNa" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -25439,6 +25383,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/garage) +"mSw" = ( +/obj/structure/curtain/medical, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/strata/white_cyan2/west, +/area/lv522/indoors/a_block/medical/glass) "mSI" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -25738,13 +25687,6 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/c_block/mining) -"naM" = ( -/obj/item/prop/alien/hugger{ - pixel_x = -7; - pixel_y = -5 - }, -/turf/open/floor/prison, -/area/lv522/outdoors/colony_streets/north_street) "naU" = ( /obj/structure/machinery/light{ dir = 8 @@ -25819,12 +25761,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, /area/lv522/indoors/a_block/security) -"ndc" = ( -/obj/effect/decal/hefa_cult_decals/d32{ - icon_state = "2" - }, -/turf/open/floor/corsat/brown/southwest, -/area/lv522/oob) "nde" = ( /obj/effect/decal/cleanable/blood/drip, /obj/structure/pipes/standard/simple/hidden/green{ @@ -25854,6 +25790,16 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security) +"neB" = ( +/obj/effect/decal/hefa_cult_decals/d96{ + desc = "You think you can make out the iconography of a Xenomorph?" + }, +/obj/effect/decal/hefa_cult_decals/d32{ + desc = "You think you can make out the iconography of a Xenomorph."; + icon_state = "bee" + }, +/turf/open/floor/corsat/plate, +/area/lv522/oob) "nfe" = ( /obj/structure/window_frame/strata, /obj/item/stack/rods, @@ -26042,11 +25988,6 @@ /obj/structure/surface/rack, /turf/open/floor/prison/floor_marked/southwest, /area/lv522/atmos/cargo_intake) -"nhY" = ( -/obj/structure/surface/table/almayer, -/obj/item/clothing/accessory/storage/black_vest, -/turf/open/floor/prison/darkredfull2, -/area/lv522/indoors/a_block/security) "nip" = ( /turf/open/asphalt/cement/cement4, /area/lv522/landing_zone_1) @@ -26056,17 +25997,6 @@ }, /turf/open/floor/plating, /area/lv522/atmos/filt) -"niC" = ( -/obj/effect/decal{ - icon = 'icons/mob/xenos/effects.dmi'; - icon_state = "acid_weak"; - layer = 2; - name = "weak acid"; - pixel_x = -10; - pixel_y = 4 - }, -/turf/open/asphalt/cement/cement3, -/area/lv522/outdoors/colony_streets/north_street) "niO" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/mucus, @@ -26089,6 +26019,12 @@ }, /turf/open/asphalt/cement/cement9, /area/lv522/outdoors/colony_streets/central_streets) +"njh" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor/south) "njm" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/item/stack/sheet/wood, @@ -26365,6 +26301,9 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) +"nrv" = ( +/turf/open/floor/corsat/brown/west, +/area/lv522/oob) "nrP" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -27235,9 +27174,6 @@ /obj/item/prop/alien/hugger, /turf/open/floor/prison/darkpurple2/north, /area/lv522/indoors/a_block/dorms) -"nNL" = ( -/turf/open/asphalt/cement, -/area/lv522/outdoors/nw_rockies) "nNM" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -27845,6 +27781,13 @@ /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges) +"ocz" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/item/stack/sheet/metal, +/turf/open/floor/prison/blue_plate/north, +/area/lv522/indoors/a_block/admin) "ocD" = ( /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, @@ -28261,10 +28204,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/closed/wall/strata_ice/dirty, /area/lv522/oob) -"oow" = ( -/obj/effect/spawner/gibspawner/human, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/w_rockies) "ooT" = ( /obj/structure/machinery/light{ dir = 1 @@ -28934,9 +28873,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/admin) -"oGH" = ( -/turf/open/floor/corsat/brown/southeast, -/area/lv522/oob) "oGJ" = ( /obj/structure/machinery/optable, /obj/structure/machinery/light{ @@ -29313,9 +29249,6 @@ }, /turf/open/floor/prison/darkyellowfull2/east, /area/lv522/indoors/c_block/t_comm) -"oQG" = ( -/turf/open/floor/corsat/browncorner/east, -/area/lv522/oob) "oQM" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat/plate, @@ -30222,10 +30155,6 @@ }, /turf/open/floor/prison/cell_stripe/west, /area/lv522/indoors/lone_buildings/storage_blocks) -"pph" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/prison/blue_plate/north, -/area/lv522/indoors/a_block/admin) "ppv" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -31001,16 +30930,6 @@ "pFl" = ( /turf/open/floor/almayer/w_y1/north, /area/lv522/oob/w_y_vault) -"pFm" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/effect/landmark/corpsespawner/colonist/burst, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/corsat/plate, -/area/lv522/atmos/east_reactor/south) "pFq" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -31447,6 +31366,11 @@ "pPC" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/outdoors/nw_rockies) +"pPY" = ( +/obj/item/device/flashlight/flare/on, +/obj/effect/decal/cleanable/blood, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/nw_rockies) "pQd" = ( /obj/effect/decal/cleanable/blood/drip, /obj/structure/bed/chair/comfy/beige, @@ -31465,10 +31389,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) -"pQB" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/blue/northwest, -/area/lv522/indoors/a_block/admin) "pQE" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/a_block/bridges) @@ -31724,17 +31644,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/shiva/radiator_tile2, /area/lv522/indoors/c_block/cargo) -"pXK" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison/darkredfull2, -/area/lv522/outdoors/colony_streets/north_street) "pYc" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 8 @@ -32016,10 +31925,6 @@ /obj/effect/decal/cleanable/cobweb2, /turf/open/floor/shiva/radiator_tile2, /area/lv522/indoors/b_block/bridge) -"qeH" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/asphalt/cement/cement1, -/area/lv522/outdoors/n_rockies) "qfa" = ( /obj/structure/bed/chair{ dir = 4 @@ -32175,6 +32080,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, /area/lv522/indoors/b_block/bar) +"qhS" = ( +/obj/item/prop/alien/hugger{ + pixel_x = 13; + pixel_y = -5 + }, +/turf/open/asphalt/cement/cement3, +/area/lv522/outdoors/colony_streets/north_street) "qic" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/c_block/cargo) @@ -32348,6 +32260,11 @@ }, /turf/open/floor/corsat/plate, /area/lv522/atmos/reactor_garage) +"qmV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/sheet/metal, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor/south) "qmW" = ( /obj/structure/surface/table/almayer{ dir = 4; @@ -32547,6 +32464,12 @@ }, /turf/open/floor/almayer/w_y1/north, /area/lv522/atmos/way_in_command_centre) +"qtn" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat/plate, +/area/lv522/atmos/east_reactor/south) "qts" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -32717,17 +32640,6 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"qxB" = ( -/obj/item/ammo_magazine/sniper{ - current_rounds = 0; - pixel_x = 10; - pixel_y = 12 - }, -/obj/item/ammo_magazine/sniper{ - current_rounds = 1 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "qxX" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -32775,23 +32687,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/white_cyan1, /area/lv522/indoors/lone_buildings/chunk) -"qzy" = ( -/obj/structure/largecrate/random/barrel{ - layer = 2.7 - }, -/obj/structure/largecrate/random/barrel{ - layer = 2.9; - pixel_x = 6; - pixel_y = -16 - }, -/obj/structure/largecrate/random/barrel{ - layer = 2.9; - pixel_x = -17; - pixel_y = -9 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_west_street) "qzB" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/corsat/plate, @@ -32937,11 +32832,6 @@ }, /turf/open/floor/corsat/marked, /area/lv522/outdoors/colony_streets/windbreaker/observation) -"qCG" = ( -/obj/structure/surface/rack, -/obj/item/clothing/under/colonist, -/turf/open/floor/prison/darkpurplefull2, -/area/lv522/indoors/a_block/dorms/glass) "qCS" = ( /obj/structure/machinery/computer/arcade{ density = 0; @@ -33205,6 +33095,12 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/outdoors/colony_streets/south_east_street) +"qJe" = ( +/obj/effect/decal/hefa_cult_decals/d32{ + desc = "You think you can make out the iconography of a Xenomorph." + }, +/turf/open/floor/corsat/brown/southeast, +/area/lv522/oob) "qJy" = ( /obj/structure/largecrate/random, /turf/open/auto_turf/shale/layer1, @@ -33573,13 +33469,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/multi_tiles, /area/lv522/indoors/c_block/mining) -"qRz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/power/apc/power/north{ - start_charge = 20 - }, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/kitchen) "qRB" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/plasteel/medium_stack, @@ -34296,13 +34185,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement/cement3, /area/lv522/landing_zone_1) -"riP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/turf/open/floor/prison/blue/north, -/area/lv522/indoors/a_block/hallway) "riT" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/blue/east, @@ -34715,6 +34597,20 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat/brown, /area/lv522/atmos/east_reactor) +"rvg" = ( +/obj/structure/closet/crate, +/obj/item/clothing/under/colonist/boilersuit/cyan, +/obj/item/clothing/under/colonist/boilersuit/cyan, +/obj/item/clothing/under/colonist/boilersuit/cyan, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/suit/storage/apron/overalls, +/obj/item/clothing/suit/storage/apron/overalls, +/obj/item/clothing/suit/storage/apron/overalls, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, +/area/lv522/indoors/c_block/mining) "rvh" = ( /obj/effect/decal/cleanable/blood/gibs/xeno/body, /obj/effect/spawner/gibspawner/xeno, @@ -34943,6 +34839,22 @@ /obj/structure/largecrate/random, /turf/open/floor/corsat/plate, /area/lv522/atmos/cargo_intake) +"rAG" = ( +/obj/structure/filingcabinet/chestdrawer{ + density = 0; + pixel_x = 8; + pixel_y = 19 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -7; + pixel_y = 19 + }, +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/prison/blue_plate/north, +/area/lv522/indoors/a_block/admin) "rAS" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/structure/machinery/light, @@ -35051,12 +34963,6 @@ /obj/effect/landmark/monkey_spawn, /turf/open/floor/corsat/squares, /area/lv522/atmos/north_command_centre) -"rDm" = ( -/obj/effect/decal/hefa_cult_decals/d32{ - desc = "You think you can make out the iconography of a Xenomorph." - }, -/turf/open/floor/corsat/brown/southeast, -/area/lv522/oob) "rDq" = ( /obj/structure/stairs/perspective{ dir = 9; @@ -35224,6 +35130,13 @@ }, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) +"rHU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/camera/autoname{ + dir = 4 + }, +/turf/open/floor/prison/blue_plate/north, +/area/lv522/indoors/a_block/admin) "rHX" = ( /obj/structure/closet/crate/trashcart, /obj/item/trash/wy_chips_pepper, @@ -36258,6 +36171,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) +"sju" = ( +/turf/open/floor/plating/platingdmg3/west, +/area/lv522/indoors/a_block/admin) "sjy" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/a_block/security) @@ -36329,6 +36245,19 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/b_block/hydro) +"sld" = ( +/obj/structure/closet/crate, +/obj/item/clothing/under/colonist/boilersuit/cyan, +/obj/item/clothing/under/colonist/boilersuit/cyan, +/obj/item/clothing/under/colonist/boilersuit/cyan, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/suit/storage/apron/overalls, +/obj/item/clothing/suit/storage/apron/overalls, +/obj/item/clothing/suit/storage/apron/overalls, +/turf/open/floor/prison, +/area/lv522/indoors/c_block/mining) "slq" = ( /obj/structure/platform_decoration{ dir = 8 @@ -36388,6 +36317,13 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"smB" = ( +/obj/effect/spawner/gibspawner/human, +/obj/effect/decal/cleanable/blood, +/obj/effect/spawner/gibspawner/human, +/obj/effect/decal/cleanable/blood, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/nw_rockies) "smN" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -36543,6 +36479,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/landing_zone_2) +"srX" = ( +/turf/open/asphalt/cement, +/area/lv522/outdoors/nw_rockies) "ssh" = ( /obj/structure/closet/crate/trashcart, /turf/open/auto_turf/sand_white/layer0, @@ -36571,11 +36510,6 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/corsat/squares, /area/lv522/atmos/east_reactor) -"stT" = ( -/obj/structure/curtain/medical, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/strata/white_cyan2/west, -/area/lv522/indoors/a_block/medical/glass) "suh" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, @@ -37198,13 +37132,6 @@ "sId" = ( /turf/open/floor/corsat/brown/northwest, /area/lv522/atmos/reactor_garage) -"sIm" = ( -/obj/effect/decal/hefa_cult_decals/d32{ - desc = "You think you can make out the iconography of a Xenomorph."; - icon_state = "4" - }, -/turf/open/floor/corsat/brown/east, -/area/lv522/oob) "sIp" = ( /obj/structure/prop/ice_colony/dense/planter_box{ dir = 9 @@ -37630,19 +37557,6 @@ }, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/east_central_street) -"sSg" = ( -/obj/effect/decal/cleanable/blood/splatter, -/obj/item/prop{ - desc = "Holy shit"; - icon = 'icons/mob/humans/species/r_human.dmi'; - icon_state = "l_foot"; - name = "left foot"; - pixel_x = 5; - pixel_y = 25 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/darkredfull2, -/area/lv522/indoors/a_block/bridges/corpo) "sSx" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/brown/north, @@ -37843,13 +37757,6 @@ }, /turf/open/floor/corsat/plate, /area/lv522/atmos/command_centre) -"sXI" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/colonist/burst, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/corsat/plate, -/area/lv522/atmos/east_reactor/south) "sXZ" = ( /obj/structure/platform{ dir = 8 @@ -38027,6 +37934,9 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat/squares, /area/lv522/atmos/cargo_intake) +"tdr" = ( +/turf/open/floor/corsat/browncorner/east, +/area/lv522/oob) "tdv" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/mechanical/green{ @@ -38051,6 +37961,17 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"tdE" = ( +/obj/effect/decal{ + icon = 'icons/mob/xenos/effects.dmi'; + icon_state = "acid_weak"; + layer = 2; + name = "weak acid"; + pixel_x = -10; + pixel_y = 4 + }, +/turf/open/asphalt/cement/cement3, +/area/lv522/outdoors/colony_streets/north_street) "tdJ" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice12"; @@ -38232,6 +38153,12 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/marked, /area/lv522/atmos/way_in_command_centre) +"tio" = ( +/obj/structure/noticeboard{ + pixel_y = 29 + }, +/turf/open/floor/prison/blue_plate/north, +/area/lv522/indoors/a_block/hallway) "tiF" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/mouse, @@ -38379,6 +38306,9 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) +"tlY" = ( +/turf/open/floor/corsat/browncorner, +/area/lv522/oob) "tml" = ( /obj/structure/platform{ dir = 1 @@ -38775,11 +38705,6 @@ }, /turf/open/floor/prison/darkyellowfull2/east, /area/lv522/indoors/lone_buildings/engineering) -"ttf" = ( -/obj/effect/spawner/gibspawner/human, -/obj/effect/decal/cleanable/blood, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/nw_rockies) "tty" = ( /obj/structure/machinery/power/port_gen/pacman/mrs, /turf/open/floor/prison/darkbrownfull2, @@ -39014,12 +38939,6 @@ /obj/structure/platform, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel/far) -"tzM" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/colonist/burst, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/corsat, -/area/lv522/atmos/east_reactor/south) "tAk" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/snacks/tofukabob, @@ -40555,6 +40474,9 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/b_block/hydro) +"ujT" = ( +/turf/open/floor/corsat/brown/southeast, +/area/lv522/oob) "ukp" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/recharger, @@ -41060,10 +40982,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/greenfull/northwest, /area/lv522/indoors/b_block/bridge) -"uyN" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison, -/area/lv522/outdoors/colony_streets/north_west_street) "uyP" = ( /obj/effect/spawner/gibspawner/xeno, /obj/structure/pipes/standard/simple/hidden/green, @@ -41480,6 +41398,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, /area/lv522/landing_zone_2/ceiling) +"uJt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, +/turf/open/floor/prison/blue/north, +/area/lv522/indoors/a_block/hallway) "uJy" = ( /obj/structure/largecrate/random, /turf/open/floor/prison/blue_plate/north, @@ -41762,6 +41687,11 @@ /obj/item/prop/alien/hugger, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) +"uPG" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat/brown/east, +/area/lv522/atmos/east_reactor/south) "uPI" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -41811,9 +41741,6 @@ }, /turf/open/floor/corsat, /area/lv522/atmos/cargo_intake) -"uQJ" = ( -/turf/open/floor/corsat/browncorner, -/area/lv522/oob) "uQO" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating, @@ -42332,6 +42259,10 @@ /obj/item/folder/red, /turf/open/floor/whiteyellowfull/east, /area/lv522/indoors/a_block/corpo) +"vdm" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/nw_rockies) "vds" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -42814,6 +42745,11 @@ }, /turf/open/floor/prison/greenfull/east, /area/lv522/indoors/b_block/hydro) +"vpA" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/blue_plate/north, +/area/lv522/indoors/a_block/admin) "vpD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -42827,11 +42763,6 @@ }, /turf/open/floor/corsat/squares, /area/lv522/atmos/cargo_intake) -"vpN" = ( -/obj/structure/surface/table/almayer, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/blue_plate/north, -/area/lv522/indoors/a_block/admin) "vpR" = ( /obj/effect/decal/cleanable/generic, /turf/open/floor/prison/darkyellowfull2/east, @@ -43068,19 +42999,6 @@ /obj/effect/landmark/queen_spawn, /turf/open/floor/corsat/squares, /area/lv522/atmos/east_reactor) -"vxa" = ( -/obj/structure/closet/crate, -/obj/item/clothing/under/colonist, -/obj/item/clothing/under/colonist, -/obj/item/clothing/under/colonist, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/suit/storage/apron/overalls, -/obj/item/clothing/suit/storage/apron/overalls, -/obj/item/clothing/suit/storage/apron/overalls, -/turf/open/floor/prison, -/area/lv522/indoors/c_block/mining) "vxf" = ( /obj/item/pipe{ dir = 9 @@ -43100,11 +43018,6 @@ }, /turf/open/asphalt/cement/cement4, /area/lv522/outdoors/colony_streets/south_street) -"vxA" = ( -/obj/item/prop/alien/hugger, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/kitchen) "vxH" = ( /obj/structure/surface/table/almayer, /obj/item/tank/emergency_oxygen/engi{ @@ -43196,6 +43109,12 @@ /obj/structure/machinery/bioprinter, /turf/open/floor/strata/cyan2/east, /area/lv522/indoors/a_block/medical) +"vAh" = ( +/obj/effect/decal/hefa_cult_decals/d32{ + icon_state = "2" + }, +/turf/open/floor/corsat/brown/southwest, +/area/lv522/oob) "vAm" = ( /turf/open/floor/corsat/brown, /area/lv522/oob) @@ -43311,11 +43230,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/dorms) -"vDw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/stack/sheet/metal, -/turf/open/floor/corsat, -/area/lv522/atmos/east_reactor/south) "vDG" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -43338,6 +43252,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/kitchen/damage) +"vDZ" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/closet/crate/weapon, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/security) "vEc" = ( /obj/structure/machinery/light, /obj/structure/machinery/disposal, @@ -43468,6 +43389,10 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison/cell_stripe, /area/lv522/atmos/way_in_command_centre) +"vGW" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, +/turf/open/floor/corsat/browncorner, +/area/lv522/atmos/east_reactor/south) "vGZ" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/corsat/brown/north, @@ -43887,6 +43812,15 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) +"vTK" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/corsat/plate, +/area/lv522/atmos/east_reactor/south) "vTO" = ( /obj/structure/machinery/landinglight/ds1{ dir = 1 @@ -44024,6 +43958,21 @@ }, /turf/open/floor/bcircuit, /area/lv522/indoors/a_block/admin) +"vWz" = ( +/obj/structure/closet/crate, +/obj/item/clothing/under/colonist/boilersuit/cyan, +/obj/item/clothing/under/colonist/boilersuit/cyan, +/obj/item/clothing/under/colonist/boilersuit/cyan, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/suit/storage/apron/overalls, +/obj/item/clothing/suit/storage/apron/overalls, +/obj/item/clothing/suit/storage/apron/overalls, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/prison, +/area/lv522/indoors/c_block/mining) "vWI" = ( /obj/structure/largecrate/random, /turf/open/floor/prison, @@ -44184,6 +44133,14 @@ /obj/structure/closet/athletic_mixed, /turf/open/floor/strata/blue1, /area/lv522/indoors/a_block/dorm_north) +"waa" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1; + pixel_y = -1 + }, +/turf/open/floor/whiteyellowfull/east, +/area/lv522/oob/w_y_vault) "wao" = ( /obj/structure/window/framed/strata/reinforced, /turf/open/floor/plating, @@ -44279,6 +44236,10 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) +"wev" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat/brown/southeast, +/area/lv522/atmos/east_reactor/south) "wex" = ( /obj/effect/decal/cleanable/blood/gibs/xeno, /obj/effect/decal/cleanable/dirt, @@ -44684,12 +44645,6 @@ }, /turf/open/floor/corsat/marked, /area/lv522/atmos/east_reactor/north) -"wni" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/colonist/burst, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/corsat/plate, -/area/lv522/atmos/east_reactor/south) "wnq" = ( /obj/structure/bed/sofa/south/grey/right{ pixel_y = 16 @@ -45034,6 +44989,11 @@ }, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/north_east_street) +"wvb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/blue/west, +/area/lv522/indoors/a_block/admin) "wvd" = ( /obj/structure/prop/dam/crane/damaged, /turf/open/auto_turf/sand_white/layer0, @@ -45462,17 +45422,6 @@ }, /turf/open/asphalt/cement/cement1, /area/lv522/outdoors/colony_streets/north_street) -"wHB" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1; - pixel_y = -1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/atmos/way_in_command_centre) "wHF" = ( /turf/open/floor/prison, /area/lv522/indoors/lone_buildings/outdoor_bot) @@ -45922,13 +45871,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/kitchen, /area/lv522/indoors/a_block/kitchen) -"wTK" = ( -/obj/structure/pipes/vents/pump, -/obj/structure/machinery/space_heater/radiator/red{ - dir = 4 - }, -/turf/open/floor/prison/blue_plate/north, -/area/lv522/indoors/a_block/admin) "wUo" = ( /obj/structure/machinery/light, /obj/structure/machinery/disposal, @@ -45944,6 +45886,16 @@ /obj/structure/closet/toolcloset, /turf/open/floor/plating, /area/lv522/oob) +"wUR" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper_bin{ + pixel_y = 5 + }, +/obj/item/tool/pen/blue/clicky, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/corsat/plate, +/area/lv522/atmos/east_reactor/south) "wUX" = ( /obj/item/stack/tile/plasteel, /obj/structure/prop/ice_colony/ground_wire{ @@ -46039,6 +45991,19 @@ /obj/structure/cargo_container/horizontal/blue/bottom, /turf/open/floor/plating/platebot, /area/lv522/indoors/c_block/cargo) +"wXH" = ( +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -7; + pixel_y = 19 + }, +/obj/structure/filingcabinet/chestdrawer{ + density = 0; + pixel_x = 8; + pixel_y = 19 + }, +/turf/open/floor/prison/blue_plate/north, +/area/lv522/indoors/a_block/admin) "wXI" = ( /obj/structure/prop/structure_lattice, /obj/structure/stairs/perspective{ @@ -47103,6 +47068,10 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) +"xyd" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/asphalt/cement/cement1, +/area/lv522/outdoors/n_rockies) "xyn" = ( /obj/structure/prop/vehicles/crawler{ dir = 8; @@ -47233,6 +47202,13 @@ }, /turf/open/floor/strata/blue1, /area/lv522/indoors/a_block/dorm_north) +"xCa" = ( +/obj/item/prop/helmetgarb/lucky_feather{ + pixel_x = 11; + pixel_y = 10 + }, +/turf/open/floor/corsat/plate, +/area/lv522/oob) "xCd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light{ @@ -47489,10 +47465,6 @@ /obj/item/ore/slag, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) -"xHl" = ( -/obj/structure/curtain/medical, -/turf/open/floor/strata/white_cyan2/west, -/area/lv522/indoors/a_block/medical/glass) "xHp" = ( /obj/structure/bed/chair/comfy, /obj/item/stack/sheet/wood, @@ -47513,15 +47485,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat/plate, /area/lv522/atmos/north_command_centre) -"xHA" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/colonist/burst, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/corsat/plate, -/area/lv522/atmos/east_reactor/south) "xHD" = ( /obj/item/prop/alien/hugger, /obj/effect/decal/cleanable/blood, @@ -47538,6 +47501,19 @@ "xIv" = ( /turf/open/floor/prison, /area/lv522/outdoors/colony_streets/north_east_street) +"xIE" = ( +/obj/effect/decal/cleanable/blood/splatter, +/obj/item/prop{ + desc = "Holy shit"; + icon = 'icons/mob/humans/species/r_human.dmi'; + icon_state = "l_foot"; + name = "left foot"; + pixel_x = 5; + pixel_y = 25 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/darkredfull2, +/area/lv522/indoors/a_block/bridges/corpo) "xIW" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -47545,10 +47521,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms) -"xIY" = ( -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/w_rockies) "xJd" = ( /obj/structure/bed/chair{ dir = 4 @@ -48716,19 +48688,6 @@ }, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/north_street) -"yjr" = ( -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/decal/cleanable/blood/gibs, -/obj/item/prop{ - desc = "Holy shit"; - dir = 8; - icon = 'icons/mob/humans/species/r_human.dmi'; - icon_state = "head_m"; - name = "human head" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/indoors/a_block/bridges/corpo) "yjt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light{ @@ -48840,6 +48799,19 @@ }, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/bridges/op_centre) +"ymg" = ( +/obj/effect/decal/cleanable/blood/splatter, +/obj/effect/decal/cleanable/blood/gibs, +/obj/item/prop{ + desc = "Holy shit"; + dir = 8; + icon = 'icons/mob/humans/species/r_human.dmi'; + icon_state = "head_m"; + name = "human head" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/indoors/a_block/bridges/corpo) (1,1,1) = {" bMX @@ -51652,7 +51624,7 @@ sRA sRA sRA sRA -xIY +iNx sRA sRA sRA @@ -51882,7 +51854,7 @@ sRA sRA sRA sRA -xIY +iNx sRA sRA sRA @@ -52112,7 +52084,7 @@ sRA sRA sRA sRA -xIY +iNx sRA sRA sRA @@ -52293,7 +52265,7 @@ vtc uWO uWO gEB -idH +pPY uWO oip uWO @@ -52333,7 +52305,7 @@ sRA sRA sRA sRA -xIY +iNx sRA sRA sRA @@ -52342,7 +52314,7 @@ sRA sRA uiK uiK -bfR +ftQ sRA sRA sRA @@ -52521,7 +52493,7 @@ uWO uWO gEB uWO -ttf +smB cpy cpy uWO @@ -52890,7 +52862,7 @@ nFj nFj nFj nFj -ldJ +kYf nFj nFj nFj @@ -52975,7 +52947,7 @@ tta tta mPW tta -nNL +srX xpg cpy cpy @@ -53026,7 +52998,7 @@ sRA sRA uiK uiK -oow +aSF ien sgs xLl @@ -53713,7 +53685,7 @@ sgs eiZ xGa xLq -uyN +bdR rum qLP wQN @@ -56622,7 +56594,7 @@ cnC eaE eaE uWO -fkB +vdm uWO eaE eaE @@ -58227,7 +58199,7 @@ vtc uWO uWO ien -qzy +lAi eyM gfi hEx @@ -60480,8 +60452,8 @@ bIJ tfP ogr ogr -fLz -fLz +cOh +cOh ogr ogr ogr @@ -60707,9 +60679,9 @@ tfP tfP cpy sNC -diN -diN -qeH +mvP +mvP +xyd sNC sNC tfP @@ -60770,7 +60742,7 @@ weR nLm nLm nLm -eDv +dnp dNm tUM rGn @@ -63506,7 +63478,7 @@ aFN mQq aFN sMV -qCG +eUD rLa qct fjP @@ -63733,7 +63705,7 @@ rId nwj gZt pZF -kvn +bNo nLm iFK lsD @@ -65297,10 +65269,10 @@ hJg hJg kVz etB -mlM +qhS gMs hJg -niC +tdE hJg meX ugV @@ -65520,7 +65492,7 @@ fjr ugV hNR kJd -cEJ +maA mok mok vHj @@ -65528,7 +65500,7 @@ vHj vHj vxK mok -ckz +fyV rWO pqk ugV @@ -65976,9 +65948,9 @@ hNR mdS pUS uUd -naM +aBK uAa -fto +gVh uAa uAa uUd @@ -66203,7 +66175,7 @@ nKZ mdS pUS uUd -dBn +aXF uUd adh adh @@ -66428,7 +66400,7 @@ cpy xDz bAn kJd -pXK +hht qYa tYT tYT @@ -68030,8 +68002,8 @@ lxc pan wTp fsW -nhY -nhY +gDv +gDv sjy gkK gmg @@ -68252,7 +68224,7 @@ tpa tpa sjy sjy -aIf +vDZ kRb kBk iJu @@ -68893,7 +68865,7 @@ opS vGS kwg iZS -wHB +cvY kWn sTf kXY @@ -69333,7 +69305,7 @@ gDO kwg jkJ kwg -hpZ +ixk meY kWn bXe @@ -69344,7 +69316,7 @@ saC kWn fRY opS -gNU +fDu hzI kXY biu @@ -69539,8 +69511,8 @@ fJz aci bZx trX -xHA -wni +eET +eQJ tiQ tiQ exW @@ -69623,7 +69595,7 @@ sjy sjy sjy kqb -qRz +jEQ pNs srJ lxL @@ -69997,12 +69969,12 @@ rBm bZx gof gof -gTO +gof evt saC saC saC -kjQ +njh yaj qjG qjG @@ -70229,12 +70201,12 @@ evt saC saC saC -tzM +mPY yaj qjG qjG qjG -tzM +mPY oUq oUq gYv @@ -70443,25 +70415,25 @@ oZI pqO dfb lmY -erW +wUR lEK trX lyN -pFm -sXI +vTK +jGV mYC gof -gTO +gof buc saC saC saC -tzM +mPY yaj qjG qjG qjG -tzM +mPY saC saC afL @@ -71134,7 +71106,7 @@ uOv nAy saC saC -bNy +lik bZx qjG qjG @@ -72119,7 +72091,7 @@ uDb xxs fdP coj -vxA +hlP lxL oLd wTr @@ -72500,7 +72472,7 @@ hCM lmh saC saC -iXA +vGW bnI gof xQc @@ -73184,7 +73156,7 @@ kXk gof gof hjt -geo +gnL dfb dfb nCs @@ -73660,7 +73632,7 @@ bQw bjd gdA fri -mon +waa wYN cqo tbW @@ -74094,7 +74066,7 @@ dfb gnL hLu oZI -cvM +kcz dfb dfb seF @@ -74144,8 +74116,8 @@ tQi gwb gwb xZz -yjr -sSg +ymg +xIE gAx fdP xxs @@ -75900,10 +75872,10 @@ gof qql swH tYg -icQ +uPG tYg -fZX -hem +wev +qtn bec pHT pHT @@ -75955,7 +75927,7 @@ wWe jBw xjF wZl -gcO +hJs wgW wgW ydb @@ -76373,7 +76345,7 @@ uQQ gof wrh pqO -vDw +qmV urH qjG bjd @@ -76739,12 +76711,12 @@ vpe rSu jas jas -cEj +vWz ncJ myE qHr vpe -vxa +sld beS bWv bWv @@ -76965,13 +76937,13 @@ eso vpe bgY jas -cEj +vWz vpe vpe vpe eso vpe -ahZ +rvg jas jas mwn @@ -78905,7 +78877,7 @@ fvs tDS tDS oiV -fMy +ocz uan rvB uan @@ -79827,7 +79799,7 @@ pVo wGY hJG mEz -iwt +jxR jUn jUn bJK @@ -80074,7 +80046,7 @@ iLw frP xUT tHa -stT +mSw eBz pEj jyz @@ -80267,7 +80239,7 @@ fvs tdj kNk cOR -ceE +cDX bOz bOz vqC @@ -80301,7 +80273,7 @@ tTK eOX tHl uOG -xHl +lXS qHP hPp fgm @@ -80493,7 +80465,7 @@ vGp fvs tDS tDS -kJY +wXH oRT scC cbs @@ -80746,7 +80718,7 @@ wJR lEI gdO gdO -riP +uJt oVR rXS eKC @@ -81193,11 +81165,11 @@ xkH iMn bYK oRT -hPg +rHU oRT wJR -vpN -vpN +vpA +vpA gdO iwZ ptg @@ -82095,8 +82067,8 @@ crU wJR wJR dCy -wTK -pph +mxl +csK gsG ylY wGY @@ -82319,10 +82291,10 @@ pZo bRm tdj nCW -pQB +mMM qQK gng -aRX +wvb vPa sWr pVo @@ -82334,7 +82306,7 @@ ppd jWe vlr gdO -bIt +tio wlD cNU rdT @@ -82549,20 +82521,20 @@ hyW atE ngY oGF -iTF +dRV sWr sWr oMi nUl rDq tDS -bQc +iwM ccy rmx ixp gdO gdO -dWI +hnx uuH tov hGr @@ -83226,7 +83198,7 @@ qSH umR bRm tDS -lll +rAG xXE nSG azJ @@ -83908,7 +83880,7 @@ umR bRm tdj kNk -cMJ +mog oGF dkq iBr @@ -84040,9 +84012,9 @@ saC tiQ tiQ szE -dRm +fGt jGy -gEZ +nrv ctM tiQ tiQ @@ -84271,7 +84243,7 @@ eqG eqG eqG eWN -ndc +vAh tiQ tiQ ezp @@ -84362,7 +84334,7 @@ tWE bRm tDS hyW -gvq +sju ngY iIs lHV @@ -84499,7 +84471,7 @@ bCQ vGA bCQ eCh -adz +hcG eof mUZ tKx @@ -84591,7 +84563,7 @@ sjW jAz atE sWr -gvq +sju sWr oNe hfy @@ -84602,7 +84574,7 @@ xXE ngY ngY nUl -dYY +dhy gdO wlh irI @@ -84720,7 +84692,7 @@ saC saC tiQ tiQ -eIZ +jef bCQ akM akM @@ -84829,7 +84801,7 @@ jZa aUF bOz pPx -vpN +vpA gdO dwV qeg @@ -84949,11 +84921,11 @@ tiQ aNV efo bHO -gkf -aaP +neB +xCa jPW pVO -oGH +ujT tiQ mUZ cNA @@ -85140,7 +85112,7 @@ xYA xYA xYA xYA -cSJ +axg xYA xYA xYA @@ -85174,12 +85146,12 @@ saC saC tiQ ulg -oQG +tdr ufl eqG eqG -uQJ -rDm +tlY +qJe tiQ tiQ qdL @@ -85404,7 +85376,7 @@ tiQ uJE hxS xvq -sIm +jLA gDe tiQ tiQ @@ -86162,7 +86134,7 @@ ien mRs rMR qSH -qxB +lEA qSH qSH vGp @@ -87293,7 +87265,7 @@ qSH qSH qSH ien -igg +grG rMR qSH oQC diff --git a/maps/map_files/LV522_Chances_Claim_FORECON/LV522_Chances_Claim_FORECON.dmm b/maps/map_files/LV522_Chances_Claim_FORECON/LV522_Chances_Claim_FORECON.dmm index 6b0f28bc5f2..c7d83965055 100644 --- a/maps/map_files/LV522_Chances_Claim_FORECON/LV522_Chances_Claim_FORECON.dmm +++ b/maps/map_files/LV522_Chances_Claim_FORECON/LV522_Chances_Claim_FORECON.dmm @@ -3725,7 +3725,6 @@ /area/lv522/indoors/a_block/fitness/glass) "bNy" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/colonist/burst, /obj/effect/landmark/xeno_spawn, /turf/open/floor/corsat/brown/west, /area/lv522/atmos/east_reactor/south) @@ -5206,7 +5205,6 @@ /area/lv522/indoors/a_block/security) "cvM" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/colonist/burst, /turf/open/floor/corsat/brown, /area/lv522/atmos/east_reactor/south) "cvT" = ( @@ -9036,7 +9034,6 @@ /obj/item/tool/pen/blue/clicky, /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /obj/effect/landmark/xeno_spawn, -/obj/effect/landmark/corpsespawner/colonist/burst, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/south) "esa" = ( @@ -12618,11 +12615,6 @@ /obj/item/clothing/glasses/kutjevo, /turf/open/floor/prison/darkyellowfull2/east, /area/lv522/indoors/lone_buildings/outdoor_bot) -"geo" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/colonist/burst, -/turf/open/floor/corsat/plate, -/area/lv522/atmos/east_reactor/south) "get" = ( /turf/open/floor/carpet, /area/lv522/atmos/east_reactor/east) @@ -14207,10 +14199,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/kitchen, /area/lv522/indoors/a_block/kitchen) -"gTO" = ( -/obj/effect/landmark/corpsespawner/colonist/burst, -/turf/open/floor/corsat/plate, -/area/lv522/atmos/east_reactor/south) "gUi" = ( /obj/structure/flora/jungle/planttop1, /turf/open/floor/grass, @@ -18186,7 +18174,6 @@ /area/lv522/indoors/c_block/cargo) "iXA" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/colonist/burst, /turf/open/floor/corsat/browncorner, /area/lv522/atmos/east_reactor/south) "iXM" = ( @@ -21034,7 +21021,6 @@ "kjQ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/colonist/burst, /obj/effect/landmark/xeno_spawn, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor/south) @@ -25743,7 +25729,6 @@ pixel_x = -1; pixel_y = -1 }, -/obj/effect/landmark/corpsespawner/wy/manager, /turf/open/floor/whiteyellowfull/east, /area/lv522/oob/w_y_vault) "mox" = ( @@ -32941,7 +32926,6 @@ /obj/structure/machinery/light{ dir = 4 }, -/obj/effect/landmark/corpsespawner/colonist/burst, /obj/effect/landmark/xeno_spawn, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/south) @@ -40132,7 +40116,6 @@ "sXI" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/colonist/burst, /obj/effect/landmark/xeno_spawn, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/south) @@ -41392,12 +41375,6 @@ /obj/structure/platform, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel/far) -"tzM" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/colonist/burst, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/corsat, -/area/lv522/atmos/east_reactor/south) "tAk" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/snacks/tofukabob, @@ -47421,12 +47398,6 @@ }, /turf/open/floor/corsat/marked, /area/lv522/atmos/east_reactor/north) -"wni" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/colonist/burst, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/corsat/plate, -/area/lv522/atmos/east_reactor/south) "wnq" = ( /obj/structure/bed/sofa/south/grey/right{ pixel_y = 16 @@ -50406,7 +50377,6 @@ dir = 8 }, /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/colonist/burst, /obj/effect/landmark/xeno_spawn, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/south) @@ -72455,7 +72425,7 @@ aci bZx trX xHA -wni +eQJ tiQ tiQ exW @@ -72912,7 +72882,7 @@ rBm bZx gof gof -gTO +gof evt saC saC @@ -73144,12 +73114,12 @@ evt saC saC saC -tzM +mPY yaj qjG qjG qjG -tzM +mPY oUq oUq gYv @@ -73366,17 +73336,17 @@ pFm sXI mYC gof -gTO +gof buc saC saC saC -tzM +mPY yaj qjG qjG qjG -tzM +mPY saC saC afL @@ -76099,7 +76069,7 @@ kXk gof gof hjt -geo +gnL dfb dfb nCs diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index 6878440d108..1fdfc3e1e47 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -2138,7 +2138,6 @@ /turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/jungle/west_jungle) "axx" = ( -/obj/effect/landmark/corpsespawner/chef, /obj/effect/decal/cleanable/blood/splatter, /obj/item/weapon/harpoon, /turf/open/gm/river, @@ -4960,7 +4959,6 @@ /area/lv624/ground/caves/sand_temple) "bJz" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/wygoon, /turf/open/floor/wood, /area/lv624/ground/caves/north_central_caves) "bJQ" = ( @@ -5435,7 +5433,7 @@ /turf/open/floor/wood, /area/lv624/lazarus/hop) "csx" = ( -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /turf/open/floor/white, /area/lv624/lazarus/medbay) "csM" = ( @@ -6032,7 +6030,6 @@ "dfJ" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/scientist, /turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/east_caves) "dfY" = ( @@ -6775,7 +6772,7 @@ icon_state = "open"; opened = 1 }, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /turf/open/floor/bluecorner, /area/lv624/lazarus/sleep_male) "edM" = ( @@ -6898,11 +6895,6 @@ "emo" = ( /turf/open/floor/whiteyellowfull/east, /area/lv624/lazarus/main_hall) -"emx" = ( -/obj/effect/landmark/corpsespawner/security/liaison, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/white, -/area/lv624/lazarus/corporate_dome) "enn" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/effect/decal/grass_overlay/grass1{ @@ -7098,7 +7090,6 @@ /area/lv624/lazarus/landing_zones/lz1) "eEl" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/wygoon, /turf/open/shuttle/bright_red, /area/lv624/lazarus/crashed_ship_containers) "eER" = ( @@ -7164,7 +7155,7 @@ name = "General Listening Channel"; pixel_x = -30 }, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /turf/open/floor/purple/northwest, /area/lv624/lazarus/sleep_female) "eKs" = ( @@ -7337,13 +7328,6 @@ /obj/item/reagent_container/food/snacks/grown/mushroom/amanita, /turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/south_west_caves) -"eZC" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/colonist/random/burst, -/turf/open/gm/dirt, -/area/lv624/ground/caves/east_caves) "eZG" = ( /obj/effect/landmark/crap_item, /turf/open/floor/white, @@ -7673,12 +7657,6 @@ }, /turf/open/floor/whiteyellowfull/east, /area/lv624/ground/caves/south_east_caves) -"fAD" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/engineer, -/turf/open/gm/dirt, -/area/lv624/ground/caves/east_caves) "fAM" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -8072,7 +8050,6 @@ /obj/structure/bed/chair/office/dark{ dir = 8 }, -/obj/effect/landmark/corpsespawner/scientist, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/whitepurple/northeast, /area/lv624/lazarus/research) @@ -8669,7 +8646,7 @@ opened = 1 }, /obj/structure/window/reinforced/tinted, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /obj/item/device/radio/intercom{ freerange = 1; frequency = 1469; @@ -9146,7 +9123,7 @@ /area/lv624/ground/caves/sand_temple) "hNR" = ( /obj/structure/surface/rack, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /turf/open/floor/vault, /area/lv624/lazarus/quartstorage) "hNT" = ( @@ -9671,12 +9648,6 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/east_caves) -"iyr" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/doctor, -/turf/open/gm/dirt, -/area/lv624/ground/caves/east_caves) "iyB" = ( /obj/structure/prop/tower, /turf/open/floor/bot/north, @@ -11706,10 +11677,6 @@ /obj/effect/landmark/hunter_primary, /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/south_east_jungle) -"lnZ" = ( -/obj/effect/landmark/corpsespawner/wygoon, -/turf/open/shuttle/bright_red, -/area/lv624/lazarus/crashed_ship_containers) "lok" = ( /turf/open/gm/dirt/desert0, /area/lv624/ground/caves/sand_temple) @@ -13294,13 +13261,6 @@ }, /turf/open/floor/whiteblue/northwest, /area/lv624/lazarus/corporate_dome) -"nHq" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/miner, -/turf/open/gm/dirt, -/area/lv624/ground/caves/east_caves) "nHE" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/bush/ausbushes/genericbush, @@ -14464,7 +14424,6 @@ /area/lv624/lazarus/crashed_ship_containers) "pfl" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/chef, /obj/item/weapon/twohanded/fireaxe, /turf/open/floor/wood, /area/lv624/ground/caves/north_central_caves) @@ -15282,7 +15241,6 @@ "qnZ" = ( /obj/structure/bed, /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/engineer, /turf/open/floor/whitebluefull, /area/lv624/lazarus/medbay) "qqJ" = ( @@ -16118,7 +16076,6 @@ "rwx" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/wygoon, /obj/effect/decal/grass_overlay/grass1{ dir = 10 }, @@ -16198,7 +16155,7 @@ /obj/structure/window/reinforced/tinted{ dir = 1 }, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /turf/open/floor/bluecorner, /area/lv624/lazarus/sleep_male) "rEk" = ( @@ -16371,7 +16328,7 @@ /area/lv624/ground/caves/east_caves) "rQc" = ( /obj/structure/surface/rack, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/dark, /area/lv624/lazarus/quartstorage) @@ -16563,7 +16520,6 @@ "sbL" = ( /obj/effect/decal/cleanable/blood, /obj/structure/bed/roller, -/obj/effect/landmark/corpsespawner/wygoon, /turf/open/floor/white, /area/lv624/lazarus/corporate_dome) "scf" = ( @@ -16922,7 +16878,6 @@ }, /obj/effect/decal/cleanable/blood/splatter, /obj/item/prop/alien/hugger, -/obj/effect/landmark/corpsespawner/scientist, /turf/open/floor/freezerfloor, /area/lv624/lazarus/research) "sCX" = ( @@ -16980,10 +16935,6 @@ }, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) -"sHf" = ( -/obj/effect/landmark/corpsespawner/miner, -/turf/open/floor/redyellowfull, -/area/lv624/ground/barrens/west_barrens/ceiling) "sHq" = ( /obj/structure/device/broken_piano, /obj/structure/machinery/light/small{ @@ -17252,7 +17203,7 @@ "sXh" = ( /obj/structure/bed, /obj/item/clothing/mask/cigarette/pipe, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /turf/open/floor/dark, /area/lv624/lazarus/engineering) "sXi" = ( @@ -18125,7 +18076,6 @@ "ulq" = ( /obj/item/device/flashlight/on, /obj/effect/decal/cleanable/blood/drip, -/obj/effect/landmark/corpsespawner/wygoon, /turf/open/shuttle/bright_red, /area/lv624/lazarus/crashed_ship_containers) "ulH" = ( @@ -18202,12 +18152,6 @@ /obj/effect/landmark/crap_item, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) -"upQ" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/colonist/random/burst, -/turf/open/gm/dirt, -/area/lv624/ground/caves/east_caves) "uqg" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 @@ -18345,11 +18289,6 @@ /obj/item/fuel_cell, /turf/open/floor/dark, /area/lv624/lazarus/engineering) -"uxq" = ( -/obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/security/liaison, -/turf/open/floor/wood, -/area/lv624/ground/caves/north_central_caves) "uxy" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/binoculars, @@ -34447,7 +34386,7 @@ iCc fSZ fSZ jdb -sHf +fSZ fSZ iCc xwr @@ -35657,7 +35596,7 @@ mfI xgE akS qdw -emx +vmW ljo kUQ qTu @@ -37297,7 +37236,7 @@ tNG avm rkc avm -uxq +bJz avm rsD sdh @@ -48544,7 +48483,7 @@ dbi paN xwE uSN -lnZ +paN paN mMh vhx @@ -59005,13 +58944,13 @@ oQm mHk egU nzw -nHq +rPK jAo umb acg umb -iyr -eZC +jAo +rPK uBR pUm vVC @@ -59918,11 +59857,11 @@ vVC pUm uBR jhj -upQ +jAo umb acg umb -fAD +jAo rPK uBR pUm diff --git a/maps/map_files/LV624/crashedship/10.digsite.dmm b/maps/map_files/LV624/crashedship/10.digsite.dmm index ef58f02863f..1a4ea801535 100644 --- a/maps/map_files/LV624/crashedship/10.digsite.dmm +++ b/maps/map_files/LV624/crashedship/10.digsite.dmm @@ -173,11 +173,6 @@ /obj/effect/decal/remains/human, /turf/open/gm/dirt, /area/lv624/lazarus/crashed_ship_containers) -"LQ" = ( -/obj/effect/landmark/corpsespawner/security, -/obj/effect/decal/cleanable/blood, -/turf/open/gm/dirt, -/area/lv624/lazarus/crashed_ship_containers) "MI" = ( /obj/structure/bed/chair/dropship/pilot, /turf/open/shuttle/bright_red, @@ -323,7 +318,7 @@ Xk Ri yV Uy -LQ +SX nt Uy Dw @@ -417,7 +412,7 @@ so zH yw Wb -LQ +SX hd UG Uy diff --git a/maps/map_files/LV624/crashedship/10.swapped.dmm b/maps/map_files/LV624/crashedship/10.swapped.dmm index 5c9d7dcb060..c2d40581420 100644 --- a/maps/map_files/LV624/crashedship/10.swapped.dmm +++ b/maps/map_files/LV624/crashedship/10.swapped.dmm @@ -27,10 +27,6 @@ }, /turf/open/gm/dirt, /area/lv624/lazarus/crashed_ship_containers) -"fd" = ( -/obj/effect/landmark/corpsespawner/security, -/turf/open/gm/dirt, -/area/lv624/lazarus/crashed_ship_containers) "fC" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/gm/dirt, @@ -410,7 +406,7 @@ tB SS AI Lc -fd +AI Lc Lc Lc diff --git a/maps/map_files/LV624/gym/30.alternate.dmm b/maps/map_files/LV624/gym/30.alternate.dmm index ba1fb557cc6..99ef1161e53 100644 --- a/maps/map_files/LV624/gym/30.alternate.dmm +++ b/maps/map_files/LV624/gym/30.alternate.dmm @@ -64,7 +64,6 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/effect/landmark/corpsespawner/colonist/random/burst, /turf/open/floor/whitepurplecorner/east, /area/lv624/lazarus/fitness) "iN" = ( diff --git a/maps/map_files/LV624/hydro/30.destroyed.dmm b/maps/map_files/LV624/hydro/30.destroyed.dmm index b9eb5573968..09f0a084d0b 100644 --- a/maps/map_files/LV624/hydro/30.destroyed.dmm +++ b/maps/map_files/LV624/hydro/30.destroyed.dmm @@ -146,7 +146,6 @@ health = 245; icon_state = "folding_1" }, -/obj/effect/landmark/corpsespawner/wy/manager, /obj/item/weapon/gun/pistol/vp78{ current_mag = null; name = "dented VP78 pistol"; diff --git a/maps/map_files/LV624/medbay/10.destroyed.dmm b/maps/map_files/LV624/medbay/10.destroyed.dmm index 2cbab724602..0d5bb05ca81 100644 --- a/maps/map_files/LV624/medbay/10.destroyed.dmm +++ b/maps/map_files/LV624/medbay/10.destroyed.dmm @@ -48,7 +48,6 @@ /turf/open/floor/platingdmg1, /area/lv624/lazarus/medbay) "il" = ( -/obj/effect/landmark/corpsespawner/doctor, /obj/effect/decal/cleanable/blood, /turf/open/floor/white, /area/lv624/lazarus/medbay) @@ -95,7 +94,6 @@ /area/lv624/lazarus/medbay) "mV" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/doctor, /turf/open/floor/plating/platingdmg3, /area/lv624/lazarus/medbay) "nG" = ( @@ -334,7 +332,6 @@ /turf/open/floor/plating/platingdmg3, /area/lv624/lazarus/medbay) "LP" = ( -/obj/effect/landmark/corpsespawner/doctor, /obj/effect/decal/cleanable/blood, /obj/item/weapon/gun/pistol/holdout, /turf/open/floor/whiteblue/east, @@ -417,7 +414,6 @@ "Xm" = ( /obj/item/stack/sheet/metal, /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/engineer, /turf/open/floor/plating/platingdmg3, /area/lv624/lazarus/medbay) "XA" = ( @@ -435,7 +431,7 @@ /turf/open/floor/plating/platingdmg3, /area/lv624/lazarus/medbay) "XR" = ( -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/platingdmg1, /area/lv624/lazarus/medbay) diff --git a/maps/map_files/LV624/medbay/30.larvasurgery.dmm b/maps/map_files/LV624/medbay/30.larvasurgery.dmm index 41b70644543..237ab9a57a0 100644 --- a/maps/map_files/LV624/medbay/30.larvasurgery.dmm +++ b/maps/map_files/LV624/medbay/30.larvasurgery.dmm @@ -24,7 +24,6 @@ /turf/open/floor, /area/lv624/lazarus/medbay) "br" = ( -/obj/effect/landmark/corpsespawner/colonist/random/burst, /obj/effect/decal/cleanable/blood, /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/whiteblue/north, @@ -93,7 +92,6 @@ /turf/open/floor/whitebluefull, /area/lv624/lazarus/medbay) "lI" = ( -/obj/effect/landmark/corpsespawner/doctor, /obj/effect/decal/cleanable/blood, /turf/open/floor/white, /area/lv624/lazarus/medbay) @@ -259,7 +257,6 @@ /obj/structure/machinery/optable, /obj/item/tank/anesthetic, /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/scientist, /turf/open/floor/whitebluefull, /area/lv624/lazarus/medbay) "Hs" = ( @@ -369,13 +366,12 @@ /turf/open/floor/white, /area/lv624/lazarus/medbay) "Uh" = ( -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /turf/open/floor/white, /area/lv624/lazarus/medbay) "Vm" = ( /obj/structure/bed, /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/engineer, /turf/open/floor/whitebluefull, /area/lv624/lazarus/medbay) "Wc" = ( diff --git a/maps/map_files/LV624/science/10.yautja.dmm b/maps/map_files/LV624/science/10.yautja.dmm index a948201c2a7..2386ee9afba 100644 --- a/maps/map_files/LV624/science/10.yautja.dmm +++ b/maps/map_files/LV624/science/10.yautja.dmm @@ -341,7 +341,6 @@ /area/lv624/lazarus/research) "RJ" = ( /obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpsespawner/scientist, /turf/open/floor/whitepurple/northeast, /area/lv624/lazarus/research) "Si" = ( @@ -351,7 +350,6 @@ /area/lv624/lazarus/research) "Ug" = ( /obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpsespawner/scientist, /turf/open/floor/white, /area/lv624/lazarus/research) "Wk" = ( diff --git a/maps/map_files/LV624/science/40.fullylocked.dmm b/maps/map_files/LV624/science/40.fullylocked.dmm index 9df33795719..545555e8863 100644 --- a/maps/map_files/LV624/science/40.fullylocked.dmm +++ b/maps/map_files/LV624/science/40.fullylocked.dmm @@ -126,11 +126,6 @@ /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/whitepurple/northeast, /area/lv624/lazarus/research) -"pL" = ( -/obj/effect/landmark/corpsespawner/scientist, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/white, -/area/lv624/lazarus/research) "qg" = ( /obj/structure/surface/rack{ layer = 2.5 @@ -358,7 +353,7 @@ ao ao ab st -pL +FJ wv ab ao @@ -456,7 +451,7 @@ ac Av dm dm -pL +FJ dm zn dm @@ -464,7 +459,7 @@ dm FJ zn dm -pL +FJ dm dm Av diff --git a/maps/map_files/LV624/sprinkles/30.nexuscenter_barricaded.dmm b/maps/map_files/LV624/sprinkles/30.nexuscenter_barricaded.dmm index d74422a285c..45172d666eb 100644 --- a/maps/map_files/LV624/sprinkles/30.nexuscenter_barricaded.dmm +++ b/maps/map_files/LV624/sprinkles/30.nexuscenter_barricaded.dmm @@ -6,12 +6,10 @@ /turf/open/floor/grass, /area/lv624/lazarus/main_hall) "aD" = ( -/obj/effect/landmark/corpsespawner/engineer, /turf/open/floor, /area/lv624/lazarus/main_hall) "aS" = ( /obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpsespawner/doctor, /obj/item/frame/table, /obj/item/ammo_casing, /turf/open/floor, @@ -311,7 +309,6 @@ /turf/open/floor/white, /area/lv624/lazarus/main_hall) "rS" = ( -/obj/effect/landmark/corpsespawner/chef, /obj/structure/surface/table{ dir = 4; flipped = 1 diff --git a/maps/map_files/LV624/standalone/clfship.dmm b/maps/map_files/LV624/standalone/clfship.dmm index 2f5bef91890..9b15bff7b83 100644 --- a/maps/map_files/LV624/standalone/clfship.dmm +++ b/maps/map_files/LV624/standalone/clfship.dmm @@ -65,11 +65,6 @@ "dN" = ( /turf/open/floor/plating, /area/lv624/lazarus/crashed_ship) -"dP" = ( -/obj/item/stack/rods, -/obj/effect/landmark/corpsespawner/clf, -/turf/open/floor/damaged3/west, -/area/lv624/lazarus/crashed_ship) "dS" = ( /obj/structure/bed, /obj/item/bedsheet/purple, @@ -319,7 +314,6 @@ /area/lv624/lazarus/crashed_ship) "jR" = ( /obj/item/stack/rods, -/obj/effect/landmark/corpsespawner/clf, /turf/open/floor/plating, /area/lv624/lazarus/crashed_ship) "jS" = ( @@ -430,10 +424,6 @@ /obj/item/weapon/gun/smg/fp9000, /turf/open/floor/platingdmg1, /area/lv624/lazarus/crashed_ship) -"nA" = ( -/obj/effect/landmark/corpsespawner/wysec, -/turf/open/floor/damaged3/west, -/area/lv624/lazarus/crashed_ship) "nJ" = ( /obj/item/stack/rods, /obj/effect/decal/cleanable/blood, @@ -697,11 +687,6 @@ /obj/structure/machinery/floodlight, /turf/open/floor/plating, /area/lv624/lazarus/crashed_ship) -"wp" = ( -/obj/effect/landmark/corpsespawner/colonist/random, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/almayer/emeraldcorner/west, -/area/lv624/lazarus/crashed_ship) "wx" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer, @@ -747,10 +732,6 @@ /obj/item/stack/rods, /turf/open/floor/platingdmg1, /area/lv624/lazarus/crashed_ship) -"xs" = ( -/obj/effect/landmark/corpsespawner/wysec, -/turf/open/gm/dirt, -/area/lv624/lazarus/crashed_ship) "xu" = ( /turf/open/gm/dirt, /area/lv624/ground/barrens/south_west_barrens) @@ -1014,10 +995,6 @@ }, /turf/open/floor/plating/platingdmg3, /area/lv624/lazarus/crashed_ship) -"GQ" = ( -/obj/effect/landmark/corpsespawner/engineer, -/turf/open/floor/plating, -/area/lv624/lazarus/crashed_ship) "Hj" = ( /turf/closed/wall/rock/brown, /area/lv624/ground/caves/south_west_caves) @@ -1314,7 +1291,6 @@ "Pb" = ( /obj/structure/bed, /obj/item/bedsheet/rd, -/obj/effect/landmark/corpsespawner/colonist, /obj/effect/decal/cleanable/blood, /turf/open/floor/almayer/green/east, /area/lv624/lazarus/crashed_ship) @@ -1665,10 +1641,6 @@ }, /turf/open/floor/damaged3/west, /area/lv624/lazarus/crashed_ship) -"Zq" = ( -/obj/effect/landmark/corpsespawner/clf, -/turf/open/floor/platingdmg1, -/area/lv624/lazarus/crashed_ship) "ZS" = ( /turf/closed/shuttle/ert{ icon_state = "rightengine_1" @@ -1977,7 +1949,7 @@ IR KW Xq qj -wp +Go HF XX ha @@ -2264,9 +2236,9 @@ lr lr lr dN -Zq +Ep JC -GQ +dN hw gc KO @@ -2365,7 +2337,7 @@ mX dN Dd ro -nA +Dd Uz ig YL @@ -2499,7 +2471,7 @@ ev IK kC dN -dP +Uz rX FM xO @@ -2551,7 +2523,7 @@ dN Dd Hx Ep -xs +ro ro Dd ro @@ -2688,7 +2660,7 @@ IK sB dN ok -Zq +Ep Xc Dd kZ @@ -2738,7 +2710,7 @@ Ep fm Dd ed -Zq +Ep lC Dm VX diff --git a/maps/map_files/LV624/standalone/corporatedome.dmm b/maps/map_files/LV624/standalone/corporatedome.dmm index 430de7e6c48..cf2a480b508 100644 --- a/maps/map_files/LV624/standalone/corporatedome.dmm +++ b/maps/map_files/LV624/standalone/corporatedome.dmm @@ -218,7 +218,6 @@ name = "Garage Shutters"; pixel_y = -28 }, -/obj/effect/landmark/corpsespawner/colonist, /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/asteroidwarning, /area/lv624/lazarus/landing_zones/lz2) @@ -269,7 +268,6 @@ /turf/open/gm/dirt, /area/lv624/ground/colony/west_tcomms_road) "ny" = ( -/obj/effect/landmark/corpsespawner/prisoner, /obj/effect/decal/cleanable/blood, /obj/item/clothing/glasses/sunglasses/blindfold, /turf/open/floor/dark, @@ -317,7 +315,6 @@ dir = 4 }, /obj/structure/closet/bodybag, -/obj/effect/landmark/corpsespawner/clf, /turf/open/floor/dark, /area/lv624/lazarus/corporate_dome) "qH" = ( @@ -404,7 +401,6 @@ /area/lv624/lazarus/corporate_dome) "wW" = ( /obj/structure/closet/bodybag, -/obj/effect/landmark/corpsespawner/security/marshal, /turf/open/floor/dark, /area/lv624/lazarus/corporate_dome) "xk" = ( @@ -535,7 +531,6 @@ "Dp" = ( /obj/effect/decal/cleanable/blood, /obj/structure/bed/roller, -/obj/effect/landmark/corpsespawner/wysec, /obj/item/prop/colony/usedbandage{ dir = 9; pixel_x = 5; @@ -872,7 +867,7 @@ icon_state = "Synthetic_Template"; name = "Display synthetic" }, -/obj/item/clothing/under/colonist{ +/obj/item/clothing/under/colonist/boilersuit/cyan{ pixel_y = -2 }, /turf/open/floor/whiteblue/southwest, @@ -915,7 +910,6 @@ /area/lv624/lazarus/landing_zones/lz2) "ZG" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/scientist, /obj/item/restraint/handcuffs, /turf/open/floor/dark, /area/lv624/lazarus/corporate_dome) diff --git a/maps/map_files/LV624/standalone/laststand.dmm b/maps/map_files/LV624/standalone/laststand.dmm index 8023be9a00b..62b6e629730 100644 --- a/maps/map_files/LV624/standalone/laststand.dmm +++ b/maps/map_files/LV624/standalone/laststand.dmm @@ -124,11 +124,6 @@ }, /turf/open/floor/wood, /area/lv624/ground/caves/north_central_caves) -"aU" = ( -/obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/chef, -/turf/open/floor/wood, -/area/lv624/ground/caves/north_central_caves) "aV" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/wood, @@ -141,11 +136,6 @@ /obj/item/weapon/gun/rifle/m41aMK1, /turf/open/floor/wood, /area/lv624/ground/caves/north_central_caves) -"bb" = ( -/obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/security/liaison, -/turf/open/floor/wood, -/area/lv624/ground/caves/north_central_caves) "bd" = ( /obj/structure/closet/crate, /obj/item/ammo_magazine/shotgun/buckshot, @@ -239,7 +229,6 @@ /area/lv624/ground/caves/north_central_caves) "pS" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/wysec, /turf/open/floor/wood, /area/lv624/ground/caves/north_central_caves) "qW" = ( @@ -468,7 +457,7 @@ Cw bf UK bf -bb +pS bf hf aA @@ -563,7 +552,7 @@ ah bf bf aV -aU +pS fH bf tE diff --git a/maps/map_files/LV624/standalone/lv-bridge-nofog.dmm b/maps/map_files/LV624/standalone/lv-bridge-nofog.dmm index d715a9e30fc..7bf2ee692b9 100644 --- a/maps/map_files/LV624/standalone/lv-bridge-nofog.dmm +++ b/maps/map_files/LV624/standalone/lv-bridge-nofog.dmm @@ -125,11 +125,6 @@ "Pz" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/north_east_jungle) -"Uh" = ( -/obj/effect/landmark/corpsespawner/miner, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/plating/asteroidfloor/north, -/area/lv624/ground/river/central_river) "VN" = ( /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) @@ -233,7 +228,7 @@ aj (7,1,1) = {" ac al -Uh +BW DX DX DX diff --git a/maps/map_files/LV624_Fixed/LV624_repaired.dmm b/maps/map_files/LV624_Fixed/LV624_repaired.dmm index 0902f6e671f..47fd1035ce5 100644 --- a/maps/map_files/LV624_Fixed/LV624_repaired.dmm +++ b/maps/map_files/LV624_Fixed/LV624_repaired.dmm @@ -104,7 +104,7 @@ /obj/structure/window/reinforced/tinted{ dir = 1 }, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /turf/open/floor/bluecorner, /area/lv624/lazarus/sleep_male) "ajM" = ( @@ -2404,7 +2404,7 @@ "cYs" = ( /obj/structure/closet/cabinet, /obj/item/weapon/baseballbat/metal, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /turf/open/floor/dark, /area/lv624/lazarus/engineering) "cYB" = ( @@ -4206,7 +4206,7 @@ name = "General Listening Channel"; pixel_x = -30 }, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /turf/open/floor/purple/northwest, /area/lv624/lazarus/sleep_female) "flc" = ( @@ -10075,7 +10075,7 @@ /obj/structure/machinery/light{ dir = 8 }, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /turf/open/floor/whiteblue/west, /area/lv624/lazarus/medbay) "mwV" = ( @@ -11419,7 +11419,7 @@ /area/lv624/ground/colony/north_tcomms_road) "onT" = ( /obj/structure/surface/rack, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /turf/open/floor/dark, /area/lv624/lazarus/quartstorage) "onX" = ( @@ -14223,7 +14223,7 @@ opened = 1 }, /obj/structure/window/reinforced/tinted, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /obj/item/device/radio/intercom{ freerange = 1; frequency = 1469; @@ -15579,7 +15579,7 @@ /area/lv624/lazarus/main_hall) "ufg" = ( /obj/structure/surface/rack, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /turf/open/floor/vault, /area/lv624/lazarus/quartstorage) "ufn" = ( @@ -15857,7 +15857,7 @@ icon_state = "open"; opened = 1 }, -/obj/item/clothing/under/colonist, +/obj/item/clothing/under/colonist/boilersuit/cyan, /turf/open/floor/bluecorner, /area/lv624/lazarus/sleep_male) "uxL" = ( @@ -17880,7 +17880,6 @@ /area/lv624/lazarus/landing_zones/lz2) "xlU" = ( /obj/structure/closet/bodybag, -/obj/effect/landmark/corpsespawner/clf, /turf/open/gm/dirt, /area/lv624/ground/barrens/north_east_barrens) "xnh" = ( diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index 9f722809782..1f8caf21ab5 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -1010,11 +1010,6 @@ /obj/structure/bed/chair/hunter, /turf/open/floor/corsat/squareswood/north, /area/varadero/interior_protected/vessel) -"aPe" = ( -/obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/scientist, -/turf/open/floor/carpet, -/area/varadero/interior/hall_SE) "aQq" = ( /obj/structure/window/framed/colony/reinforced/hull, /turf/open/floor/plating/icefloor, @@ -1640,7 +1635,6 @@ "brc" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/colonist, /turf/open/gm/dirt/desert3, /area/varadero/exterior/eastbeach) "brR" = ( @@ -2500,10 +2494,6 @@ /obj/structure/largecrate/random/secure, /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/lz1_near) -"cdL" = ( -/obj/effect/landmark/corpsespawner/colonist/burst, -/turf/open/floor/carpet, -/area/varadero/interior/bunks) "cdS" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/carpet, @@ -3341,7 +3331,6 @@ /area/varadero/interior_protected/vessel) "cKK" = ( /obj/item/paper/crumpled/bloody, -/obj/effect/landmark/corpsespawner/security, /turf/open/floor/carpet, /area/varadero/interior/maintenance/north) "cLd" = ( @@ -5108,7 +5097,6 @@ /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/north) "ecX" = ( -/obj/effect/landmark/corpsespawner/engineer, /obj/effect/decal/cleanable/blood, /turf/open/gm/coast/north, /area/varadero/exterior/pontoon_beach) @@ -5225,13 +5213,6 @@ }, /turf/open/gm/coast/east, /area/varadero/exterior/comms4) -"ehU" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/landmark/corpsespawner/security, -/turf/open/floor/shiva/floor3, -/area/varadero/interior/security) "ehY" = ( /obj/item/clothing/under/shorts/red{ pixel_y = 9; @@ -6359,11 +6340,6 @@ "fay" = ( /turf/closed/wall/r_wall, /area/varadero/interior/research) -"faB" = ( -/obj/effect/landmark/corpsespawner/miner, -/obj/effect/decal/cleanable/blood, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/caves/swcaves) "faS" = ( /obj/structure/bed/chair{ icon_state = "chair_alt"; @@ -6372,10 +6348,6 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/comms2) -"fbr" = ( -/obj/effect/landmark/corpsespawner/miner, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) "fbw" = ( /obj/structure/prop/ice_colony/dense/planter_box/hydro{ desc = "A high-power hydroelectric generator."; @@ -6957,7 +6929,6 @@ /area/varadero/exterior/eastbeach) "fyi" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/colonist, /obj/item/weapon/sword/katana, /turf/open/floor/carpet, /area/varadero/interior/chapel) @@ -9532,7 +9503,6 @@ /area/varadero/interior/security) "hAY" = ( /obj/structure/bed, -/obj/effect/landmark/corpsespawner/prisoner, /obj/effect/decal/cleanable/blood, /turf/open/floor/shiva/floor3, /area/varadero/interior/security) @@ -9723,7 +9693,6 @@ pixel_x = 9; pixel_y = 9 }, -/obj/effect/landmark/corpsespawner/colonist, /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/pontoon_beach) @@ -10693,10 +10662,6 @@ /obj/structure/blocker/invisible_wall/water, /turf/open/gm/coast/beachcorner/south_west, /area/varadero/exterior/farocean) -"iAN" = ( -/obj/effect/landmark/corpsespawner/colonist/burst, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior_protected/maintenance/south) "iAP" = ( /obj/structure/platform/kutjevo/smooth{ climb_delay = 1; @@ -11163,7 +11128,6 @@ /obj/structure/pipes/vents/pump{ dir = 4 }, -/obj/effect/landmark/corpsespawner/engineer, /turf/open/floor/shiva, /area/varadero/interior/technical_storage) "iRO" = ( @@ -12021,10 +11985,6 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/maintenance/south) -"jJf" = ( -/obj/effect/landmark/corpsespawner/colonist/burst, -/turf/open/gm/coast/beachcorner/north_west, -/area/varadero/interior/caves/east) "jJn" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/coast/south, @@ -13284,10 +13244,6 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/eastbeach) -"kBg" = ( -/obj/effect/landmark/corpsespawner/colonist/burst, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior_protected/caves) "kBo" = ( /obj/structure/surface/table/woodentable, /obj/structure/pipes/standard/simple/hidden/green{ @@ -14563,10 +14519,6 @@ }, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/electrical) -"lFk" = ( -/obj/effect/landmark/corpsespawner/colonist/burst, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/caves/east) "lFA" = ( /obj/structure/machinery/storm_siren{ dir = 8; @@ -15592,7 +15544,6 @@ /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/lz2_near) "mwd" = ( -/obj/effect/landmark/corpsespawner/colonist/burst, /obj/effect/decal/cleanable/blood, /turf/open/floor/wood, /area/varadero/interior/court) @@ -15730,7 +15681,6 @@ /turf/open/floor/carpet, /area/varadero/interior/hall_SE) "mCU" = ( -/obj/effect/landmark/corpsespawner/security, /obj/effect/decal/cleanable/blood, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/research) @@ -15808,13 +15758,6 @@ /obj/structure/machinery/light/small, /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/eastbeach) -"mEt" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/landmark/corpsespawner/colonist/burst, -/turf/open/floor/shiva/snow_mat/east, -/area/varadero/interior/medical) "mED" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand_white/layer1, @@ -17143,10 +17086,6 @@ /obj/item/tool/warning_cone, /turf/open/gm/dirt, /area/varadero/exterior/pontoon_beach) -"nHG" = ( -/obj/effect/landmark/corpsespawner/miner, -/turf/open/floor/white, -/area/varadero/interior/toilets) "nHP" = ( /obj/structure/barricade/handrail/wire{ layer = 3.5 @@ -17346,7 +17285,6 @@ /obj/structure/pipes/vents/pump{ dir = 4 }, -/obj/effect/landmark/corpsespawner/doctor, /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/shiva/redfull, /area/varadero/interior/medical) @@ -17802,7 +17740,6 @@ /obj/item/ammo_casing/shell{ icon_state = "cartridge_10" }, -/obj/effect/landmark/corpsespawner/miner, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/caves) "olB" = ( @@ -18509,7 +18446,6 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/obj/effect/landmark/corpsespawner/security, /obj/effect/decal/cleanable/blood, /turf/open/floor/shiva/floor3, /area/varadero/interior/security) @@ -19097,10 +19033,6 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/north) -"pdh" = ( -/obj/effect/landmark/corpsespawner/colonist/burst, -/turf/open/floor/prison/chapel_carpet/doubleside/north, -/area/varadero/interior/chapel) "pdn" = ( /obj/item/tool/shovel/spade, /turf/open/gm/dirt, @@ -21031,10 +20963,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/security) -"qAS" = ( -/obj/effect/landmark/corpsespawner/colonist/burst, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/maintenance/south) "qBx" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -21910,7 +21838,6 @@ /area/varadero/interior/electrical) "rjL" = ( /obj/structure/machinery/optable, -/obj/effect/landmark/corpsespawner/colonist/burst, /obj/effect/decal/cleanable/blood, /turf/open/floor/shiva/snow_mat/east, /area/varadero/interior/medical) @@ -24256,13 +24183,6 @@ /obj/structure/girder/displaced, /turf/open/gm/dirt, /area/varadero/exterior/lz2_near) -"sZk" = ( -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 4 - }, -/obj/effect/landmark/corpsespawner/scientist, -/turf/open/floor/shiva/north, -/area/varadero/interior/research) "sZL" = ( /obj/structure/platform/kutjevo/smooth{ dir = 4; @@ -24467,7 +24387,6 @@ /area/varadero/interior/electrical) "tin" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/green, -/obj/effect/landmark/corpsespawner/doctor, /obj/effect/decal/cleanable/vomit, /turf/open/floor/shiva/floor3, /area/varadero/interior/medical) @@ -24776,10 +24695,6 @@ /obj/effect/landmark/yautja_teleport, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/caves/north_research) -"tyR" = ( -/obj/effect/landmark/corpsespawner/colonist, -/turf/open/floor/shiva/multi_tiles/east, -/area/varadero/interior/morgue) "tzm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24812,10 +24727,6 @@ }, /turf/open/floor/corsat/squareswood/north, /area/varadero/interior_protected/vessel) -"tAT" = ( -/obj/effect/landmark/corpsespawner/colonist/burst, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/caves/swcaves) "tBJ" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/green{ @@ -25774,7 +25685,6 @@ /area/varadero/interior/research) "usl" = ( /obj/effect/decal/cleanable/blood/gibs, -/obj/effect/landmark/corpsespawner/colonist/burst, /turf/open/floor/shiva/redfull, /area/varadero/interior/medical) "usu" = ( @@ -26570,10 +26480,6 @@ }, /turf/open/floor/shiva/green, /area/varadero/interior/court) -"uZN" = ( -/obj/effect/landmark/corpsespawner/engineer, -/turf/open/floor/shiva/multi_tiles/north, -/area/varadero/interior/electrical) "uZV" = ( /turf/open/floor/shiva/blue/north, /area/varadero/interior/maintenance) @@ -30041,13 +29947,6 @@ }, /turf/open/floor/strata/grey_multi_tiles, /area/varadero/interior_protected/vessel) -"xMp" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/landmark/corpsespawner/colonist/burst, -/turf/open/floor/white, -/area/varadero/interior/toilets) "xNw" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/carpet, @@ -30191,7 +30090,6 @@ /turf/open/floor/carpet, /area/varadero/interior/library) "xUQ" = ( -/obj/effect/landmark/corpsespawner/chef, /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/shiva/multi_tiles/north, @@ -32663,7 +32561,7 @@ pGs jQa jQa jQa -tAT +jQa jQa jQa jQa @@ -32816,7 +32714,7 @@ jQa geo jQa jQa -faB +qwE jQa jQa jQa @@ -33881,7 +33779,7 @@ aXc dAs xnu gcq -sZk +cqo rsq hhz lcW @@ -34292,7 +34190,7 @@ pGs jQa jQa jQa -tAT +jQa jQa jQa pGs @@ -35719,7 +35617,7 @@ vYW vYW vYW rqr -kBg +rqr dGu hto vYW @@ -38123,7 +38021,7 @@ pGs geo jQa jQa -tAT +jQa qwE jQa jQa @@ -39491,7 +39389,7 @@ rVi brX oXf jZE -pdh +kix bio bLB vAB @@ -40056,7 +39954,7 @@ gLu mHI tSG nxW -mEt +tRu giA qcN xOu @@ -41853,7 +41751,7 @@ cDG rRg sKC whv -tyR +mVq aGE eeF mnJ @@ -41925,7 +41823,7 @@ xvr oAN oAN oAN -iAN +oAN oAN ksX cty @@ -47351,7 +47249,7 @@ iLD xNR kPL vNu -cdL +vNu oWs qFZ fgk @@ -47360,7 +47258,7 @@ gzl ydx qVH aFg -aPe +woF qnp gFx bIQ @@ -50971,7 +50869,7 @@ kBZ cHF bmS ryD -fbr +ryD ryD ryD ajC @@ -52798,7 +52696,7 @@ jPM cHF cHF ryD -lFk +kbQ kbQ kbQ eyt @@ -52821,7 +52719,7 @@ wVf xvF wVf vGm -ehU +jZg seJ bNT hWZ @@ -52870,7 +52768,7 @@ xGV mCF iDn xxk -qAS +xxk sQI dDG cWW @@ -53168,7 +53066,7 @@ kbQ kbQ kbQ kbQ -lFk +kbQ ykk cHF ajC @@ -53394,7 +53292,7 @@ gNA gRZ uXS noY -xMp +bEU gRZ kNa rdr @@ -53508,7 +53406,7 @@ wOO vii iqS xst -uZN +kIi xst aRg tVS @@ -54258,7 +54156,7 @@ ryD ouy ofC qIF -jJf +uet cFz eyt wqb @@ -54298,7 +54196,7 @@ kbQ kbQ uXS uqt -nHG +gRZ uXS gFF wup @@ -55037,7 +54935,7 @@ sEP cHF nJg phC -iAN +oAN oAN xxk hBA diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm index f146ff81859..436e7f0248b 100644 --- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm +++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm @@ -37,11 +37,6 @@ }, /turf/open/floor/interior/plastic, /area/strata/ag/interior/paths/cabin_area/central) -"aal" = ( -/obj/structure/bed/nest, -/obj/effect/landmark/corpsespawner/upp, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/interior/outpost/gen/bball/nest) "aam" = ( /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/interior/outpost/gen/bball/nest) @@ -86,12 +81,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/interior/outpost/gen/bball/nest) -"aax" = ( -/obj/structure/bed/nest, -/obj/effect/decal/cleanable/blood/gibs/core, -/obj/effect/landmark/corpsespawner/upp, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/interior/outpost/gen/bball/nest) "aay" = ( /obj/structure/platform/strata{ dir = 1 @@ -295,16 +284,9 @@ }, /turf/closed/wall/wood, /area/strata/ag/interior/paths/cabin_area/central) -"abj" = ( -/obj/structure/bed/nest, -/obj/effect/decal/cleanable/blood/gibs/core, -/obj/effect/landmark/corpsespawner/miner, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/interior/outpost/gen/bball/nest) "abk" = ( /obj/structure/bed/nest, /obj/effect/decal/cleanable/blood/gibs/core, -/obj/effect/landmark/corpsespawner/russian, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/interior/outpost/gen/bball/nest) "abl" = ( @@ -473,7 +455,6 @@ "acW" = ( /obj/structure/bed/nest, /obj/effect/decal/cleanable/blood/gibs/core, -/obj/effect/landmark/corpsespawner/upp, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/interior/outpost/gen/bball/nest) "acX" = ( @@ -583,10 +564,6 @@ /obj/effect/landmark/monkey_spawn, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/cabin_area) -"aev" = ( -/obj/effect/landmark/corpsespawner/upp, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/interior/outpost/gen/bball/nest) "aez" = ( /obj/structure/flora/bush/ausbushes/grassybush, /turf/open/auto_turf/strata_grass/layer1, @@ -3075,7 +3052,6 @@ /obj/effect/decal/strata_decals/catwalk/prison, /obj/effect/decal/cleanable/blood, /obj/effect/landmark/costume/butler, -/obj/effect/landmark/corpsespawner/chef, /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 }, @@ -8198,7 +8174,6 @@ icon_state = "abed" }, /obj/item/bedsheet/brown, -/obj/effect/landmark/corpsespawner/doctor, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/southresearch) "bty" = ( @@ -8981,11 +8956,6 @@ /obj/structure/cargo_container/wy/right, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/nearlz2) -"byq" = ( -/obj/structure/bed/nest, -/obj/effect/landmark/corpsespawner/upp, -/turf/open/floor/strata/fake_wood, -/area/strata/ug/interior/jungle/deep/minehead) "byr" = ( /obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer2, @@ -10009,7 +9979,6 @@ pixel_y = 20 }, /obj/structure/surface/table/woodentable, -/obj/effect/landmark/corpsespawner/doctor, /turf/open/floor/interior/plastic, /area/strata/ag/interior/outpost/canteen) "bXG" = ( @@ -12843,7 +12812,6 @@ /area/strata/ag/interior/dorms) "eiz" = ( /obj/structure/bed/nest, -/obj/effect/landmark/corpsespawner/doctor, /turf/open/floor/strata/fake_wood, /area/strata/ug/interior/jungle/deep/minehead) "eiE" = ( @@ -12888,13 +12856,6 @@ "ekJ" = ( /turf/closed/wall/strata_ice/jungle, /area/strata/ug/interior/jungle/deep/south_engi) -"ekN" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/effect/landmark/corpsespawner/engineer, -/turf/open/floor/strata/fake_wood, -/area/strata/ag/interior/outpost/engi) "ekR" = ( /turf/open/floor/strata/red1, /area/strata/ag/interior/nearlz1) @@ -13955,7 +13916,6 @@ /obj/structure/toilet{ dir = 4 }, -/obj/effect/landmark/corpsespawner/russian, /turf/open/floor/strata/white_cyan2/west, /area/strata/ug/interior/jungle/deep/structures/res) "fnf" = ( @@ -15740,7 +15700,6 @@ /turf/open/floor/strata/blue1, /area/strata/ag/interior/outpost/admin) "gUx" = ( -/obj/effect/landmark/corpsespawner/bridgeofficer, /obj/effect/decal/cleanable/blood, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/administration) @@ -15915,11 +15874,6 @@ /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/greengrid, /area/strata/ug/interior/jungle/deep/structures/engi) -"hfr" = ( -/obj/structure/bed/chair/office/light, -/obj/effect/landmark/corpsespawner/russian, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/security) "hft" = ( /obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/strata/floor3, @@ -16337,10 +16291,6 @@ /obj/structure/machinery/door/airlock/almayer/maint/colony, /turf/open/floor/prison/darkredfull2, /area/strata/ag/interior/dorms/maintenance) -"hyu" = ( -/obj/effect/landmark/corpsespawner/russian, -/turf/open/auto_turf/strata_grass/layer0_mud, -/area/strata/ug/interior/jungle/deep/east_engi) "hyx" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ dir = 1; @@ -16932,7 +16882,6 @@ /obj/structure/barricade/wooden{ dir = 8 }, -/obj/effect/landmark/corpsespawner/chef, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/canteen/bar) "iau" = ( @@ -17296,7 +17245,6 @@ /area/strata/ug/interior/outpost/jung/dorms/sec1) "iqH" = ( /obj/structure/closet/bodybag, -/obj/effect/landmark/corpsespawner/scientist, /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/southresearch) @@ -19566,7 +19514,6 @@ "kAU" = ( /obj/structure/bed/nest, /obj/effect/decal/cleanable/blood/gibs/core, -/obj/effect/landmark/corpsespawner/miner, /turf/open/floor/strata/fake_wood, /area/strata/ug/interior/jungle/deep/minehead) "kBB" = ( @@ -19873,7 +19820,6 @@ "kRe" = ( /obj/structure/bed/nest, /obj/effect/decal/cleanable/blood/gibs/core, -/obj/effect/landmark/corpsespawner/russian, /obj/item/ammo_magazine/revolver/upp, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/dorms/hive) @@ -20836,7 +20782,6 @@ /area/strata/ug/interior/jungle/deep/minehead) "lIk" = ( /obj/structure/machinery/optable, -/obj/effect/landmark/corpsespawner/russian, /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/blood{ icon_state = "xgib2" @@ -23648,12 +23593,6 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outpost/med) -"ope" = ( -/obj/structure/bed/nest, -/obj/effect/decal/cleanable/blood/gibs/core, -/obj/effect/landmark/corpsespawner/doctor, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/interior/dorms/hive) "opg" = ( /obj/structure/machinery/power/terminal{ dir = 4 @@ -24373,12 +24312,6 @@ /obj/structure/flora/grass/tallgrass/jungle/corner, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/south_dorms) -"pbm" = ( -/obj/structure/bed/nest, -/obj/effect/decal/cleanable/blood/gibs/core, -/obj/effect/landmark/corpsespawner/chef, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/interior/dorms/hive) "pbw" = ( /obj/structure/filingcabinet, /turf/open/floor/strata/floor2, @@ -25670,11 +25603,6 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"qhp" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/effect/landmark/corpsespawner/engineer, -/turf/open/floor/greengrid, -/area/strata/ag/interior/outpost/engi) "qhQ" = ( /obj/structure/barricade/handrail/strata{ dir = 8 @@ -26706,11 +26634,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/tcomms) -"rbX" = ( -/obj/structure/bed/nest, -/obj/effect/landmark/corpsespawner/miner, -/turf/open/floor/strata/fake_wood, -/area/strata/ug/interior/jungle/deep/minehead) "rcp" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/disposalpipe/segment{ @@ -27086,7 +27009,6 @@ /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/outpost/gen/foyer) "rvL" = ( -/obj/effect/landmark/corpsespawner/russian, /obj/structure/bed/roller, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/gen/bball) @@ -29025,10 +28947,6 @@ }, /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/platform/east/scrub) -"tkN" = ( -/obj/effect/landmark/corpsespawner/doctor, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "tla" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/snacks/plump_pie, @@ -30276,7 +30194,6 @@ dir = 1; pixel_y = 20 }, -/obj/effect/landmark/corpsespawner/russian, /obj/structure/bed/roller, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/gen/bball) @@ -30401,12 +30318,6 @@ "uAx" = ( /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/administration) -"uAG" = ( -/obj/structure/bed/nest, -/obj/effect/decal/cleanable/blood/gibs/core, -/obj/effect/landmark/corpsespawner/upp, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/interior/dorms/hive) "uAP" = ( /obj/structure/inflatable/popped, /obj/effect/decal/cleanable/blood, @@ -31727,10 +31638,6 @@ "vPQ" = ( /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/south_dorms) -"vPY" = ( -/obj/effect/landmark/corpsespawner/upp, -/turf/open/floor/strata, -/area/strata/ug/interior/outpost/jung/dorms/admin1) "vQo" = ( /turf/closed/wall/strata_ice/jungle, /area/strata/ug/interior/jungle/platform/east/scrub) @@ -32856,11 +32763,6 @@ "wQQ" = ( /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/gen/foyer) -"wRk" = ( -/obj/effect/landmark/corpsespawner/doctor, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/tcomms) "wSy" = ( /obj/structure/pipes/standard/manifold/hidden/cyan, /obj/structure/barricade/handrail/strata{ @@ -33010,12 +32912,6 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/strata/white_cyan3, /area/strata/ag/interior/outpost/med) -"xcj" = ( -/obj/structure/bed/nest, -/obj/effect/decal/cleanable/blood/gibs/core, -/obj/effect/landmark/corpsespawner/russian, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/interior/dorms/hive) "xcq" = ( /obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/strata/multi_tiles/southwest, @@ -34138,10 +34034,6 @@ /obj/structure/barricade/handrail/strata, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outpost/gen/bball) -"yba" = ( -/obj/effect/landmark/corpsespawner/security/liaison, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/canteen/bar) "ybr" = ( /obj/structure/machinery/vending/sovietsoda, /turf/open/floor/strata/multi_tiles/southwest, @@ -38865,7 +38757,7 @@ crA cnO bjY eih -ope +uPq yjb bjY eih @@ -39454,7 +39346,7 @@ cnO cnO pPX bjY -ope +uPq cnO ddp crY @@ -39643,7 +39535,7 @@ aac aac crA jif -pbm +uPq qRF uPq cnO @@ -41199,13 +41091,13 @@ aac aac crA cnO -uAG +uPq uPq cnO fpp ddp kJS -xcj +uPq cnO wGx xzq @@ -49095,7 +48987,7 @@ btq btp aac sgG -wRk +hbA fYs nBk vxd @@ -54624,7 +54516,7 @@ aab aac aac aac -aal +aao aHz bgn aan @@ -54888,7 +54780,7 @@ aLP wfI aOd dzL -ekN +ryt wmZ wmZ aUS @@ -56774,11 +56666,11 @@ paw evM cdo aam -aax +abk aam cdo pIa -aax +abk cBe cdo cdo @@ -57011,7 +56903,7 @@ ayw ayw ayw iEY -qhp +bVM oQs snq asu @@ -57567,7 +57459,7 @@ aan aam ahn adC -aev +aam aar cdo aar @@ -58183,7 +58075,7 @@ aHh djW djW ijo -hfr +xmM qMw xWU vxT @@ -60599,7 +60491,7 @@ wZZ sUE aYQ aYQ -vPY +hwI pEm hwI piD @@ -61905,7 +61797,7 @@ oWV ckK ycz wVl -yba +mSx pzC wOv wOv @@ -62237,13 +62129,13 @@ aac aac aac pIa -abj +abk aas aHz aag aHz aao -aax +abk cdo aHz pIa @@ -62823,7 +62715,7 @@ aac aac aac pIa -abj +abk abk pIa pIa @@ -64042,7 +63934,7 @@ cmM cmM oPH cmM -tkN +cmM jeM nak cmM @@ -70247,7 +70139,7 @@ aad aad bnd bnd -byq +eiz abC eiz bnd @@ -70441,7 +70333,7 @@ aad aad aad bnd -byq +eiz kGF jci sjq @@ -71029,7 +70921,7 @@ bnd bnd kAU abC -rbX +eiz bnd bDm sjq @@ -79318,7 +79210,7 @@ wHW tgC wHW wHW -hyu +wHW wHW sah tgC diff --git a/maps/new_varadero.json b/maps/new_varadero.json index ec90142c229..b052aa7f5d2 100644 --- a/maps/new_varadero.json +++ b/maps/new_varadero.json @@ -4,23 +4,6 @@ "map_file": "New_Varadero.dmm", "webmap_url": "NewVaradero", "weather_holder": "/datum/weather_ss_map_holder/new_varadero", - - "survivor_types": [ - "/datum/equipment_preset/survivor/scientist/nv", - "/datum/equipment_preset/survivor/doctor/nv", - "/datum/equipment_preset/survivor/chaplain/nv", - "/datum/equipment_preset/survivor/engineer/nv", - "/datum/equipment_preset/survivor/trucker/nv", - "/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison/nv", - "/datum/equipment_preset/survivor/security/nv", - "/datum/equipment_preset/survivor/beachbum", - "/datum/equipment_preset/survivor/miner", - "/datum/equipment_preset/survivor/clf" - ], - "CO_survivor_types": [ - "/datum/equipment_preset/survivor/new_varadero/commander" - ], - "defcon_triggers": [ 3300, 2100, diff --git a/maps/new_varadero_repaired.json b/maps/new_varadero_repaired.json index 66ab3566b63..1435b67f54b 100644 --- a/maps/new_varadero_repaired.json +++ b/maps/new_varadero_repaired.json @@ -4,23 +4,6 @@ "map_file": "New_Varadero_Repaired.dmm", "webmap_url": "NewVaradero", "weather_holder": "/datum/weather_ss_map_holder/new_varadero", - - "survivor_types": [ - "/datum/equipment_preset/survivor/scientist/nv", - "/datum/equipment_preset/survivor/doctor/nv", - "/datum/equipment_preset/survivor/chaplain/nv", - "/datum/equipment_preset/survivor/engineer/nv", - "/datum/equipment_preset/survivor/trucker/nv", - "/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/nv", - "/datum/equipment_preset/survivor/security/nv", - "/datum/equipment_preset/survivor/beachbum", - "/datum/equipment_preset/survivor/miner", - "/datum/equipment_preset/survivor/clf" - ], - "CO_survivor_types": [ - "/datum/equipment_preset/survivor/new_varadero/commander" - ], - "defcon_triggers": [ 3300, 2100, diff --git a/maps/prison_station_fop.json b/maps/prison_station_fop.json index 01117492021..e6f10c58e9a 100644 --- a/maps/prison_station_fop.json +++ b/maps/prison_station_fop.json @@ -2,18 +2,6 @@ "map_name": "Fiorina Cellblocks", "map_path": "map_files/FOP_v2_Cellblocks", "map_file": "Prison_Station_FOP.dmm", - "survivor_types": [ - "/datum/equipment_preset/survivor/scientist/fiorina", - "/datum/equipment_preset/survivor/doctor/fiorina", - "/datum/equipment_preset/survivor/interstellar_human_rights_observer", - "/datum/equipment_preset/survivor/security/fiorina", - "/datum/equipment_preset/survivor/prisoner", - "/datum/equipment_preset/survivor/prisoner", - "/datum/equipment_preset/survivor/gangleader", - "/datum/equipment_preset/survivor/engineer/fiorina", - "/datum/equipment_preset/survivor/clf", - "/datum/equipment_preset/survivor/civilian" - ], "defcon_triggers": [ 3750, 2600, diff --git a/maps/runtime.json b/maps/runtime.json index a08f7bc22f0..6fc9302729d 100644 --- a/maps/runtime.json +++ b/maps/runtime.json @@ -2,9 +2,6 @@ "map_name": "USS Runtime", "map_path": "map_files/USS_Runtime", "map_file": "USS_Runtime.dmm", - "survivor_types": [ - "/datum/equipment_preset/survivor/scientist/lv" - ], "traits": [{"Ground": true}], "camouflage": "classic", "disable_ship_map": true diff --git a/maps/runtime_multiz.json b/maps/runtime_multiz.json index c83946b0665..ee75f045122 100644 --- a/maps/runtime_multiz.json +++ b/maps/runtime_multiz.json @@ -2,9 +2,6 @@ "map_name": "USS Runtime", "map_path": "map_files/USS_Runtime_multiz", "map_file": "USS_Runtime_multiz.dmm", - "survivor_types": [ - "/datum/equipment_preset/survivor/scientist/lv" - ], "traits": [{"Ground": true}, {"Ground": true}], "camouflage": "classic", "disable_ship_map": true diff --git a/maps/shivas_snowball.json b/maps/shivas_snowball.json index 60ee8b27c99..74c80e2468f 100644 --- a/maps/shivas_snowball.json +++ b/maps/shivas_snowball.json @@ -7,16 +7,6 @@ "COLD": true }, "weather_holder": "/datum/weather_ss_map_holder/shivas_snowball", - "survivor_types": [ - "/datum/equipment_preset/survivor/corporate/shiva", - "/datum/equipment_preset/survivor/doctor/shiva", - "/datum/equipment_preset/survivor/scientist/shiva", - "/datum/equipment_preset/survivor/engineer/shiva", - "/datum/equipment_preset/survivor/colonial_marshal/shiva", - "/datum/equipment_preset/survivor/security/shiva", - "/datum/equipment_preset/survivor/clf/cold", - "/datum/equipment_preset/survivor/civilian" - ], "defcon_triggers": [ 3300, 2100, diff --git a/maps/sorokyne_strata.json b/maps/sorokyne_strata.json index 5a0f6d67c41..a77597801dd 100644 --- a/maps/sorokyne_strata.json +++ b/maps/sorokyne_strata.json @@ -7,14 +7,6 @@ "COLD": true }, "weather_holder": "/datum/weather_ss_map_holder/sorokyne", - "survivor_types": [ - "/datum/equipment_preset/survivor/scientist/soro", - "/datum/equipment_preset/survivor/doctor/soro", - "/datum/equipment_preset/survivor/engineer/soro", - "/datum/equipment_preset/survivor/corporate/soro", - "/datum/equipment_preset/survivor/security/soro", - "/datum/equipment_preset/survivor/interstellar_human_rights_observer/soro" - ], "defcon_triggers": [ 3750, 2600,