diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index ab27821bf3e0..77d79c2ea968 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -217,6 +217,7 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST) //-------- WY Goons --------// #define JOB_WY_GOON "WY Corporate Security" #define JOB_WY_GOON_TECH "WY Corporate Security Technician" +#define JOB_WY_GOON_MEDIC "WY Corporate Security Medical Specialist" #define JOB_WY_GOON_LEAD "WY Corporate Security Lead" #define JOB_WY_GOON_RESEARCHER "WY Research Consultant" diff --git a/code/datums/skills/civilian.dm b/code/datums/skills/civilian.dm index ff9cadf02913..dee31efad505 100644 --- a/code/datums/skills/civilian.dm +++ b/code/datums/skills/civilian.dm @@ -83,6 +83,50 @@ CIVILIAN SKILL_VEHICLE = SKILL_VEHICLE_SMALL, ) +/datum/skills/civilian/survivor/goon/engineer + name = "Survivor Goon Engineer" + additional_skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + ) + +/datum/skills/civilian/survivor/goon/medic + name = "Survivor Goon Medic" + additional_skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + ) + +/datum/skills/civilian/survivor/goon/leader + name = "Survivor Goon Leader" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + ) + + /datum/skills/civilian/survivor/pmc name = "Survivor PMC" additional_skills = list( diff --git a/code/game/objects/effects/landmarks/survivor_spawner.dm b/code/game/objects/effects/landmarks/survivor_spawner.dm index ce83712aee7b..57a914707ea8 100644 --- a/code/game/objects/effects/landmarks/survivor_spawner.dm +++ b/code/game/objects/effects/landmarks/survivor_spawner.dm @@ -89,20 +89,52 @@ /obj/effect/landmark/survivor_spawner/lv624_corporate_dome_cl equipment = /datum/equipment_preset/survivor/corporate/executive synth_equipment = /datum/equipment_preset/synth/survivor/wy/security_synth - intro_text = list("

You are the last alive Executive of Lazarus Landing!

",\ + intro_text = list("

You are the last living Executive of Lazarus Landing!

",\ "You are aware of the xenomorph threat.",\ "Your primary objective is to survive the outbreak.") - story_text = "You are a Corporate Liaison stationed on LV-624 from Weyland-Yutani. You were tipped off about some very peculiar looking eggs recovered from the alien temple North-East of the colony. Being the smart Executive the Company hired you to be, you decided to prepare your office for the worst when the first 'facehugger' was born in the vats of the Research Dome. Turned out, you were right, everyone who called you crazy and called these the new 'synthetics' is now dead, you along with your Corporate Security detail are the only survivors due to your paranoia. The xenomorph onslaught was relentless, a fuel tank was shot by one of the Officers, leading to the destruction of a part of the dome, along with alot of the defences being melted. You must survive and find a way to contact Weyland-Yutani." + story_text = "You are a Corporate Liaison stationed on LV-624 from Weyland-Yutani. You were tipped off about some very peculiar looking eggs recovered from the alien temple North-East of the colony. Being the smart Executive the Company hired you to be, you decided to prepare your office for the worst when the first 'facehugger' was born in the vats of the Research Dome. Turns out you were right, and everyone who called you crazy and called these creatures the new 'synthetics' is now dead; you along with your Corporate Security detail are the only survivors due to your paranoia. The xenomorph onslaught was relentless, a fuel tank was shot by one of the Officers, leading to the destruction of part of the dome, along with a lot of the defences being melted. You must survive and find a way to contact Weyland-Yutani." spawn_priority = SPAWN_PRIORITY_VERY_HIGH + /obj/effect/landmark/survivor_spawner/lv624_corporate_dome_goon equipment = /datum/equipment_preset/survivor/goon 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.",\ "Your primary objective is to survive the outbreak.") - story_text = "You are a Corporate Security Officer stationed on LV-624 from Weyland-Yutani. Suddenly one day you were pulled aside by the Corporate Liaison and told to bring supplies from both Engineering and the Marshals Offices to their office, and fast. You began fortifying the Corporate Dome and was told by the Executive that something big will ravage the entire colony, excluding you. Turns out, the Liaison was right, these so called 'xenomorphs' broke containment from the Research Dome and began destroying the entire colony. Once they came for the Dome and tried to kill all of you, you barely managed to hold them off even after losing one Officer and alot of the defences. The Liaison said they will soon find a way to contact Weyland-Yutani and to remain steadfast until rescue arrives." + story_text = "You are a Corporate Security Officer stationed on LV-624 from Weyland-Yutani. Suddenly one day you were pulled aside by the Corporate Liaison and told to bring supplies from the Marshals Offices to their office, and fast. You began fortifying the Corporate Dome and was told by the Executive that something big will ravage the entire colony, excluding you. Turns out, the Liaison was right, and these so called 'xenomorphs' broke containment from the Research Dome and began destroying the entire colony. Once they came for the Dome and tried to kill all of you, you barely managed to hold them off even after losing one Officer and a lot of the defences. The Liaison said they will soon find a way to contact Weyland-Yutani and to remain steadfast until rescue arrives." + + spawn_priority = SPAWN_PRIORITY_LOW + +/obj/effect/landmark/survivor_spawner/lv624_corporate_dome_goon_medic + equipment = /datum/equipment_preset/survivor/goon/medic + synth_equipment = /datum/equipment_preset/synth/survivor/wy/security_synth + intro_text = list("

You are a Corporate Security Medical Specialist!

",\ + "You are aware of the xenomorph threat.",\ + "Your primary objective is to survive the outbreak.") + story_text = "You are a Corporate Security Medical Specialist stationed on LV-624 from Weyland-Yutani. Suddenly one day you were pulled aside by the Corporate Liaison and told to bring supplies from Medical to their office, and fast. You began fortifying the Corporate Dome and was told by the Executive that something big will ravage the entire colony, excluding you. Turns out, the Liaison was right, and these so called 'xenomorphs' broke containment from the Research Dome and began destroying the entire colony. Once they came for the Dome and tried to kill all of you, you barely managed to hold them off even after losing one Officer, despite your best efforts, and a lot of the defences. The Liaison said they will soon find a way to contact Weyland-Yutani and to remain steadfast until rescue arrives." + + spawn_priority = SPAWN_PRIORITY_VERY_HIGH + + +/obj/effect/landmark/survivor_spawner/lv624_corporate_dome_goon_tech + equipment = /datum/equipment_preset/survivor/goon/engi + synth_equipment = /datum/equipment_preset/synth/survivor/wy/security_synth + intro_text = list("

You are a Corporate Security Technician!

",\ + "You are aware of the xenomorph threat.",\ + "Your primary objective is to survive the outbreak.") + story_text = "You are a Corporate Security Technician stationed on LV-624 from Weyland-Yutani. Suddenly one day you were pulled aside by the Corporate Liaison and told to bring supplies from Engineering to their office, and fast. You began fortifying the Corporate Dome and was told by the Executive that something big will ravage the entire colony, excluding you. Turns out, the Liaison was right, and these so called 'xenomorphs' broke containment from the Research Dome and began destroying the entire colony. Once they came for the Dome and tried to kill all of you, you barely managed to hold them off even after losing one Officer and a lot of the defences. The Liaison said they will soon find a way to contact Weyland-Yutani and to remain steadfast until rescue arrives." + + spawn_priority = SPAWN_PRIORITY_MEDIUM + +/obj/effect/landmark/survivor_spawner/lv624_corporate_dome_goon_lead + equipment = /datum/equipment_preset/survivor/goon/leader + synth_equipment = /datum/equipment_preset/synth/survivor/wy/security_synth + intro_text = list("

You are a Corporate Security Team Lead!

",\ + "You are aware of the xenomorph threat.",\ + "Your primary objective is to survive the outbreak.") + story_text = "You are a Corporate Security Team Lead stationed on LV-624 from Weyland-Yutani. Suddenly one day you were pulled aside by the Corporate Liaison and told to bring a security team to their office, and fast. You began fortifying the Corporate Dome and was told by the Executive that something big will ravage the entire colony, excluding you. Turns out, the Liaison was right, and these so called 'xenomorphs' broke containment from the Research Dome and began destroying the entire colony. Once they came for the Dome and tried to kill all of you, you barely managed to hold them off even after losing one Officer and a lot of the defences. The Liaison said they will soon find a way to contact Weyland-Yutani and to remain steadfast until rescue arrives." spawn_priority = SPAWN_PRIORITY_HIGH diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 805f0ecf4030..a018fe7a294f 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -1091,6 +1091,10 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r worn_accessible = TRUE max_fuel = 180 +/obj/item/storage/backpack/marine/engineerpack/ert/five_slot + max_storage_space = 12 + max_fuel = 100 + /obj/item/storage/backpack/commando name = "commando bag" desc = "A heavy-duty bag carried by Weyland-Yutani commandos." 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 index 508333da303d..436233d0f044 100644 --- 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 @@ -8,7 +8,8 @@ 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) + faction = FACTION_WY + faction_group = FACTION_LIST_SURVIVOR_WY access = list( ACCESS_WY_GENERAL, ACCESS_WY_COLONIAL, @@ -49,3 +50,145 @@ 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) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/document(new_human), WEAR_R_STORE) + +// /obj/effect/landmark/survivor_spawner/lv624_corporate_dome_goon_tech + +/datum/equipment_preset/survivor/goon/engi + name = "Survivor - Corporate Security Goon Engineer" + flags = EQUIPMENT_PRESET_START_OF_ROUND + assignment = JOB_WY_GOON_TECH + rank = JOB_WY_GOON_TECH + minimap_icon = "goon_engi" + paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) + faction = FACTION_WY + faction_group = FACTION_LIST_SURVIVOR_WY + idtype = /obj/item/card/id/silver/cl + skills = /datum/skills/civilian/survivor/goon/engineer + languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) + access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_COMMAND, ACCESS_CIVILIAN_BRIG, ACCESS_WY_COLONIAL, ACCESS_CIVILIAN_ENGINEERING) + + survivor_variant = ENGINEERING_SURVIVOR + +/datum/equipment_preset/survivor/goon/engi/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/glasses/welding, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET) + + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/ert/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/stack/sheet/plasteel/med_small_stack(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human), WEAR_IN_JACKET) + 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/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/survival/full(new_human), WEAR_L_STORE) + +// /obj/effect/landmark/survivor_spawner/lv624_corporate_dome_goon_medic + +/datum/equipment_preset/survivor/goon/medic + name = "Survivor - Corporate Security Goon Medic" + flags = EQUIPMENT_PRESET_START_OF_ROUND + assignment = JOB_WY_GOON_MEDIC + rank = JOB_WY_GOON_MEDIC + minimap_icon = "goon_medic" + paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) + faction = FACTION_WY + faction_group = FACTION_LIST_SURVIVOR_WY + idtype = /obj/item/card/id/silver/cl + skills = /datum/skills/civilian/survivor/goon/medic + languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) + access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_COMMAND, ACCESS_CIVILIAN_BRIG, ACCESS_WY_COLONIAL, ACCESS_CIVILIAN_MEDBAY) + + survivor_variant = MEDICAL_SURVIVOR + +/datum/equipment_preset/survivor/goon/medic/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) + 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/clothing/shoes/marine/corporate/knife, 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/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) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88_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/survival/full(new_human), WEAR_L_STORE) + +// /obj/effect/landmark/survivor_spawner/lv624_corporate_dome_goon_lead + +/datum/equipment_preset/survivor/goon/leader + name = "Survivor - Corporate Security Goon Leader" + flags = EQUIPMENT_PRESET_START_OF_ROUND + assignment = JOB_WY_GOON_LEAD + rank = JOB_WY_GOON_LEAD + minimap_icon = "goon_leader" + paygrades = list(PAY_SHORT_CSPO = JOB_PLAYTIME_TIER_0) + role_comm_title = "SL" + faction = FACTION_WY + faction_group = FACTION_LIST_SURVIVOR_WY + idtype = /obj/item/card/id/silver/cl + skills = /datum/skills/civilian/survivor/goon/leader + 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, + ) + + survivor_variant = SECURITY_SURVIVOR + +/datum/equipment_preset/survivor/goon/leader/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/corporate/knife, 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/stack/sheet/metal/large_stack(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/nsg23(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/nsg23(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/nsg23(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88_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/nsg23/no_lock/stripped, 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) + diff --git a/code/modules/gear_presets/survivors/misc.dm b/code/modules/gear_presets/survivors/misc.dm index fa70c497a05b..f03695d3c3d7 100644 --- a/code/modules/gear_presets/survivors/misc.dm +++ b/code/modules/gear_presets/survivors/misc.dm @@ -176,7 +176,10 @@ Everything below isn't used or out of place. name = "Survivor - Corporate Security Goon" flags = EQUIPMENT_PRESET_START_OF_ROUND assignment = JOB_WY_GOON + rank = JOB_WY_GOON paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) + faction = FACTION_WY + faction_group = FACTION_LIST_SURVIVOR_WY idtype = /obj/item/card/id/silver/cl skills = /datum/skills/civilian/survivor/goon languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index 56ceb261dd5c..526977c52b81 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -483,6 +483,7 @@ /datum/equipment_preset/synth/survivor/wy/security_synth name = "Survivor - Synthetic - Corporate Security Synth" idtype = /obj/item/card/id/silver/cl + faction_group = FACTION_LIST_SURVIVOR_WY role_comm_title = "WY Syn" minimap_background = "background_pmc" equipment_to_spawn = list( @@ -508,6 +509,7 @@ /datum/equipment_preset/synth/survivor/wy/protection_synth name = "Survivor - Synthetic - Corporate Protection Synth" idtype = /obj/item/card/id/pmc + faction_group = FACTION_LIST_SURVIVOR_WY role_comm_title = "WY Syn" minimap_icon = "pmc_syn" minimap_background = "background_pmc" @@ -533,6 +535,7 @@ /datum/equipment_preset/synth/survivor/wy/corporate_synth name = "Survivor - Synthetic - Corporate Clerical Synth" idtype = /obj/item/card/id/data + faction_group = FACTION_LIST_SURVIVOR_WY role_comm_title = "WY Syn" equipment_to_spawn = list( WEAR_L_EAR = /obj/item/device/radio/headset/distress/WY, diff --git a/code/modules/gear_presets/wy_goons.dm b/code/modules/gear_presets/wy_goons.dm index 0d5717dfcf73..728c8109eaf9 100644 --- a/code/modules/gear_presets/wy_goons.dm +++ b/code/modules/gear_presets/wy_goons.dm @@ -131,6 +131,7 @@ assignment = JOB_WY_GOON_LEAD rank = JOB_WY_GOON_LEAD paygrades = list(PAY_SHORT_CSPO = JOB_PLAYTIME_TIER_0) + role_comm_title = "SL" skills = /datum/skills/wy_goon_lead minimap_icon = "goon_leader" diff --git a/icons/ui_icons/map_blips.dmi b/icons/ui_icons/map_blips.dmi index a2ed506adc13..5230e19499b6 100644 Binary files a/icons/ui_icons/map_blips.dmi and b/icons/ui_icons/map_blips.dmi differ diff --git a/maps/map_files/LV624/standalone/corporatedome.dmm b/maps/map_files/LV624/standalone/corporatedome.dmm index 1f654499ea88..121d0c5bcbd6 100644 --- a/maps/map_files/LV624/standalone/corporatedome.dmm +++ b/maps/map_files/LV624/standalone/corporatedome.dmm @@ -464,6 +464,7 @@ /area/lv624/lazarus/corporate_dome) "zx" = ( /obj/effect/decal/cleanable/blood/gibs/xeno, +/obj/effect/landmark/survivor_spawner/lv624_corporate_dome_goon_medic, /turf/open/floor/white, /area/lv624/lazarus/corporate_dome) "zz" = ( @@ -821,6 +822,10 @@ /obj/item/frame/table/wood/fancy, /turf/open/floor/whiteyellow/northeast, /area/lv624/lazarus/corporate_dome) +"Tk" = ( +/obj/effect/landmark/survivor_spawner/lv624_corporate_dome_goon_tech, +/turf/open/floor/dark, +/area/lv624/lazarus/corporate_dome) "TF" = ( /obj/structure/machinery/light{ dir = 8 @@ -935,7 +940,7 @@ /turf/open/floor/white, /area/lv624/lazarus/corporate_dome) "ZT" = ( -/obj/effect/landmark/survivor_spawner/lv624_corporate_dome_cl, +/obj/effect/landmark/survivor_spawner/lv624_corporate_dome_goon_lead, /turf/open/floor/white, /area/lv624/lazarus/corporate_dome) @@ -1058,7 +1063,7 @@ Bh mw Bh Bh -Bh +Tk Bh Bh qH