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

Solaris Ridge PMC Nightmare small changes #4622

Merged
merged 5 commits into from
Oct 13, 2023
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,26 @@
flags = EQUIPMENT_PRESET_START_OF_ROUND
assignment = "Weyland-Yutani PMC"
faction = FACTION_SURVIVOR
faction_group = list(FACTION_SURVIVOR)
faction_group = list(FACTION_WY, FACTION_SURVIVOR)
paygrade = "PMC-OP"
idtype = /obj/item/card/id/pmc
skills = /datum/skills/civilian/survivor/pmc
languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE)
access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_COMMAND)
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)
Expand Down Expand Up @@ -77,12 +91,17 @@
access = list(
ACCESS_WY_GENERAL,
ACCESS_WY_COLONIAL,
ACCESS_WY_LEADERSHIP,
ACCESS_WY_MEDICAL,
ACCESS_WY_SECURITY,
ACCESS_WY_EXEC,
ACCESS_WY_RESEARCH,
ACCESS_WY_ENGINEERING,
ACCESS_WY_MEDICAL,
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)
Expand All @@ -95,11 +114,12 @@
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/dress, 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/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/firstaid/ert(new_human), WEAR_R_STORE)
add_pmc_survivor_weapon(new_human)
Expand All @@ -110,8 +130,22 @@
/datum/equipment_preset/synth/survivor/pmc
name = "Survivor - Synthetic - PMC Support Synth"
faction = FACTION_SURVIVOR
faction_group = list(FACTION_SURVIVOR)
access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_COMMAND)
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
Expand All @@ -122,15 +156,16 @@

/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/surg_vest/equipped, 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/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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feels a bit odd to have for a robot who wouldn't need to drink, but i don't mind either way

new_human.equip_to_slot_or_del(new /obj/item/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/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/glasses/night/experimental_mesons, WEAR_EYES)
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)
Expand Down
4 changes: 4 additions & 0 deletions code/modules/gear_presets/synths.dm
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,10 @@
. = ..()
access = get_access(ACCESS_LIST_COLONIAL_ALL) + get_region_accesses(2) + get_region_accesses(4) + ACCESS_MARINE_RESEARCH //Access to civillians stuff + medbay stuff + engineering stuff + research

/datum/equipment_preset/synth/survivor/pmc/New()
. = ..()
access = get_access(ACCESS_LIST_WY_PMC)

/datum/equipment_preset/synth/survivor/load_gear(mob/living/carbon/human/new_human)
for(var/equipment in equipment_to_spawn)
var/equipment_path = islist(equipment_to_spawn[equipment]) ? pick(equipment_to_spawn[equipment]) : equipment_to_spawn[equipment]
Expand Down