Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LV-624 Corporate Dome Nightmare Insert Changes #7031

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
44 changes: 44 additions & 0 deletions code/datums/skills/civilian.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
38 changes: 35 additions & 3 deletions code/game/objects/effects/landmarks/survivor_spawner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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("<h2>You are the last alive Executive of Lazarus Landing!</h2>",\
intro_text = list("<h2>You are the last living Executive of Lazarus Landing!</h2>",\
"<span class='notice'>You are aware of the xenomorph threat.</span>",\
"<span class='danger'>Your primary objective is to survive the outbreak.</span>")
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("<h2>You are a Corporate Security Officer!</h2>",\
"<span class='notice'>You are aware of the xenomorph threat.</span>",\
"<span class='danger'>Your primary objective is to survive the outbreak.</span>")
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("<h2>You are a Corporate Security Medical Specialist!</h2>",\
"<span class='notice'>You are aware of the xenomorph threat.</span>",\
"<span class='danger'>Your primary objective is to survive the outbreak.</span>")
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("<h2>You are a Corporate Security Technician!</h2>",\
"<span class='notice'>You are aware of the xenomorph threat.</span>",\
"<span class='danger'>Your primary objective is to survive the outbreak.</span>")
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("<h2>You are a Corporate Security Team Lead!</h2>",\
"<span class='notice'>You are aware of the xenomorph threat.</span>",\
"<span class='danger'>Your primary objective is to survive the outbreak.</span>")
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

Expand Down
4 changes: 4 additions & 0 deletions code/game/objects/items/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)

3 changes: 3 additions & 0 deletions code/modules/gear_presets/survivors/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading
Loading