Skip to content

Commit 9118f3c

Browse files
BonniePandoraAndroBetel
BonniePandora
and
AndroBetel
authored
Slight PMC & WY backend tweaks (#974)
Co-authored-by: AndroBetel <[email protected]>
1 parent c96ccc2 commit 9118f3c

File tree

8 files changed

+46
-46
lines changed

8 files changed

+46
-46
lines changed

‎code/datums/emergency_calls/inspection.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,13 @@
154154

155155
if(!leader && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(H.client, list(JOB_SQUAD_LEADER), time_required_for_job))
156156
leader = H
157-
arm_equipment(H, /datum/equipment_preset/pmc/pmc_leader, TRUE, TRUE)
157+
arm_equipment(H, /datum/equipment_preset/pmc/leader, TRUE, TRUE)
158158
to_chat(H, SPAN_ROLE_HEADER("You are a Weyland Yutani PMC Inspector!"))
159159
to_chat(H, SPAN_ROLE_BODY("While officially your outfit does mundane security work for Weyland-Yutani, in practice you serve as both official and unofficial investigators into conduct of Company personnel. You are being dispatched to the [MAIN_SHIP_NAME] to make sure that the local Liaison has not forgotten their priorities or worse, thought to bite the hand that feeds them."))
160160
to_chat(H, SPAN_ROLE_BODY("Remember the USCM personnel on the ship may not appreciate your presence there. Should the Liaison be in jail, you are not to act as legal counsel in any way unless instructed to do so by Dispatch. Your basic duty is to make a detailed report of anything involving the Liaison and any other WY personnel on board the ship."))
161161
to_chat(H, SPAN_WARNING("Unless ordered otherwise by Dispatch, you are to avoid open conflict with the Marines. Retreat and make a report if they are outright hostile. Ahelp if you have any more questions or wish to release this character for other players."))
162162
else
163-
arm_equipment(H, /datum/equipment_preset/pmc/pmc_standard, TRUE, TRUE)
163+
arm_equipment(H, /datum/equipment_preset/pmc/standard, TRUE, TRUE)
164164
to_chat(H, SPAN_ROLE_HEADER("You are part of a Weyland-Yutani PMC Investigation Team!"))
165165
to_chat(H, SPAN_ROLE_BODY("While officially your outfit does mundane security work for Weyland-Yutani, in practice you serve as both official and unofficial investigators into conduct of Company personnel. The Lead Investigator is in charge, your duty is to provide backup, counsel and any other form of assistance you can render to make sure their mission is a success."))
166166
to_chat(H, SPAN_ROLE_BODY("Remember that the USCM, or at least some parts of it, may be hostile towards your presence on the ship. Unless ordered otherwise by Dispatch, you and your Team Leader are to avoid open conflict with the Marines. Your main priority is making sure that your Lead survives to write the report they are due."))

‎code/datums/emergency_calls/pmc.dm

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,26 @@
3434
if(!leader && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(mob.client, JOB_SQUAD_LEADER, time_required_for_job))
3535
leader = mob
3636
to_chat(mob, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Squad Leader!"))
37-
arm_equipment(mob, /datum/equipment_preset/pmc/pmc_leader, TRUE, TRUE)
37+
arm_equipment(mob, /datum/equipment_preset/pmc/leader, TRUE, TRUE)
3838
else if(synths < max_synths && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_SYNTH) && mob.client.check_whitelist_status(WHITELIST_SYNTHETIC))
3939
synths++
4040
to_chat(mob, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Support Synthetic!"))
4141
arm_equipment(mob, /datum/equipment_preset/pmc/synth, TRUE, TRUE)
4242
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))
4343
medics++
4444
to_chat(mob, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Medic!"))
45-
arm_equipment(mob, /datum/equipment_preset/pmc/pmc_medic, TRUE, TRUE)
45+
arm_equipment(mob, /datum/equipment_preset/pmc/medic, TRUE, TRUE)
4646
else if(smartgunners < max_smartgunners && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_SMARTGUNNER) && check_timelock(mob.client, JOB_SQUAD_SMARTGUN))
4747
smartgunners++
4848
to_chat(mob, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Heavy Gunner!"))
49-
arm_equipment(mob, /datum/equipment_preset/pmc/pmc_gunner, TRUE, TRUE)
49+
arm_equipment(mob, /datum/equipment_preset/pmc/gunner, TRUE, TRUE)
5050
else if(heavies < max_heavies && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_HEAVY) && check_timelock(mob.client, JOB_SQUAD_SPECIALIST))
5151
heavies++
5252
to_chat(mob, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Sniper!"))
53-
arm_equipment(mob, /datum/equipment_preset/pmc/pmc_sniper, TRUE, TRUE)
53+
arm_equipment(mob, /datum/equipment_preset/pmc/sniper, TRUE, TRUE)
5454
else
5555
to_chat(mob, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Operator!"))
56-
arm_equipment(mob, /datum/equipment_preset/pmc/pmc_standard, TRUE, TRUE)
56+
arm_equipment(mob, /datum/equipment_preset/pmc/standard, TRUE, TRUE)
5757

5858
print_backstory(mob)
5959

@@ -126,18 +126,18 @@
126126
if(!leader && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(H.client, JOB_SQUAD_LEADER, time_required_for_job)) //First one spawned is always the leader.
127127
leader = H
128128
to_chat(H, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Squad Leader!"))
129-
arm_equipment(H, /datum/equipment_preset/pmc/pmc_leader, TRUE, TRUE)
129+
arm_equipment(H, /datum/equipment_preset/pmc/leader, TRUE, TRUE)
130130
else if(medics < max_medics && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_MEDIC) && check_timelock(H.client, JOB_SQUAD_MEDIC, time_required_for_job))
131131
medics++
132132
to_chat(H, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Medical Investigator!"))
133-
arm_equipment(H, /datum/equipment_preset/pmc/pmc_medic, TRUE, TRUE)
133+
arm_equipment(H, /datum/equipment_preset/pmc/medic, TRUE, TRUE)
134134
else if(heavies < max_heavies && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_SMARTGUNNER) && check_timelock(H.client, JOB_SQUAD_SMARTGUN, time_required_for_job))
135135
heavies++
136136
to_chat(H, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Heavy Gunner!"))
137-
arm_equipment(H, /datum/equipment_preset/pmc/pmc_gunner, TRUE, TRUE)
137+
arm_equipment(H, /datum/equipment_preset/pmc/gunner, TRUE, TRUE)
138138
else
139139
to_chat(H, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Detainer!"))
140-
arm_equipment(H, /datum/equipment_preset/pmc/pmc_standard, TRUE, TRUE)
140+
arm_equipment(H, /datum/equipment_preset/pmc/standard, TRUE, TRUE)
141141

142142
print_backstory(H)
143143

‎code/game/jobs/job/special/weyland_yutani.dm

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,43 +55,43 @@
5555

5656
/datum/job/special/wey_yu/pmc/standard
5757
title = JOB_PMC_STANDARD
58-
gear_preset = /datum/equipment_preset/pmc/pmc_standard
58+
gear_preset = /datum/equipment_preset/pmc/standard
5959

6060
/datum/job/special/wey_yu/pmc/medic
6161
title = JOB_PMC_MEDIC
62-
gear_preset = /datum/equipment_preset/pmc/pmc_medic
62+
gear_preset = /datum/equipment_preset/pmc/medic
6363

6464
/datum/job/special/wey_yu/pmc/engineer
6565
title = JOB_PMC_ENGINEER
6666
gear_preset = /datum/equipment_preset/pmc/technician
6767

6868
/datum/job/special/wey_yu/pmc/gunner
6969
title = JOB_PMC_GUNNER
70-
gear_preset = /datum/equipment_preset/pmc/pmc_gunner
70+
gear_preset = /datum/equipment_preset/pmc/gunner
7171

7272
/datum/job/special/wey_yu/pmc/sniper
7373
title = JOB_PMC_SNIPER
74-
gear_preset = /datum/equipment_preset/pmc/pmc_sniper
74+
gear_preset = /datum/equipment_preset/pmc/sniper
7575

7676
/datum/job/special/wey_yu/pmc/leader
7777
title = JOB_PMC_LEADER
78-
gear_preset = /datum/equipment_preset/pmc/pmc_leader
78+
gear_preset = /datum/equipment_preset/pmc/leader
7979

8080
/datum/job/special/wey_yu/pmc/investigator
8181
title = JOB_PMC_INVESTIGATOR
82-
gear_preset = /datum/equipment_preset/pmc/pmc_leader
82+
gear_preset = /datum/equipment_preset/pmc/leader
8383

8484
/datum/job/special/wey_yu/pmc/lead_invest
8585
title = JOB_PMC_LEAD_INVEST
86-
gear_preset = /datum/equipment_preset/pmc/pmc_leader
86+
gear_preset = /datum/equipment_preset/pmc/leader
8787

8888
/datum/job/special/wey_yu/pmc/detainer
8989
title = JOB_PMC_DETAINER
90-
gear_preset = /datum/equipment_preset/pmc/pmc_standard
90+
gear_preset = /datum/equipment_preset/pmc/standard
9191

9292
/datum/job/special/wey_yu/pmc/crewman
9393
title = JOB_PMC_CREWMAN
94-
gear_preset = /datum/equipment_preset/pmc/pmc_crewman
94+
gear_preset = /datum/equipment_preset/pmc/crewman
9595

9696
/datum/job/special/wey_yu/pmc/doctor
9797
title = JOB_PMC_DOCTOR

‎code/game/objects/effects/landmarks/survivor_spawner.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
spawn_priority = SPAWN_PRIORITY_HIGH
121121

122122
/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_medic
123-
equipment = /datum/equipment_preset/pmc/pmc_medic
123+
equipment = /datum/equipment_preset/pmc/medic
124124
synth_equipment = /datum/equipment_preset/synth/survivor/pmc
125125
intro_text = list("<h2>You are a survivor of a crash landing!</h2>",\
126126
"You are NOT aware of the xenomorph threat.",\
@@ -133,7 +133,7 @@
133133
spawn_priority = SPAWN_PRIORITY_VERY_HIGH
134134

135135
/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_engineer
136-
equipment = /datum/equipment_preset/pmc/pmc_standard
136+
equipment = /datum/equipment_preset/pmc/standard
137137
synth_equipment = /datum/equipment_preset/synth/survivor/pmc
138138
intro_text = list("<h2>You are a survivor of a crash landing!</h2>",\
139139
"You are NOT aware of the xenomorph threat.",\

‎code/modules/gear_presets/colonist.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@
754754
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR)
755755
//head
756756
if(prob(85))
757-
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD)
757+
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/weyyu, WEAR_HEAD)
758758
//uniform
759759
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black(new_human), WEAR_BODY)
760760
var/obj/item/clothing/under/liaison_suit/black/uniform = new()
@@ -797,7 +797,7 @@
797797
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR)
798798
//head
799799
if(prob(25))
800-
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD)
800+
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/weyyu, WEAR_HEAD)
801801
else
802802
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD)
803803
//uniform
@@ -838,7 +838,7 @@
838838
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR)
839839
//head
840840
if(prob(25))
841-
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD)
841+
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/weyyu, WEAR_HEAD)
842842
else
843843
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD)
844844
//uniform

‎code/modules/gear_presets/pmc.dm

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@
4949

5050

5151
//*****************************************************************************************************/
52-
/datum/equipment_preset/pmc/pmc_standard
52+
/datum/equipment_preset/pmc/standard
5353
name = "Weyland-Yutani PMC (Standard)"
5454
flags = EQUIPMENT_PRESET_EXTRA
5555
assignment = JOB_PMC_STANDARD
5656
rank = JOB_PMC_STANDARD
5757
paygrades = list(PAY_SHORT_PMC_OP = JOB_PLAYTIME_TIER_0)
5858
skills = /datum/skills/pmc
5959

60-
/datum/equipment_preset/pmc/pmc_standard/load_gear(mob/living/carbon/human/new_human)
60+
/datum/equipment_preset/pmc/standard/load_gear(mob/living/carbon/human/new_human)
6161
//back
6262
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK)
6363
new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK)
@@ -111,15 +111,15 @@
111111
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_L_STORE)
112112

113113
//*****************************************************************************************************/
114-
/datum/equipment_preset/pmc/pmc_medic
114+
/datum/equipment_preset/pmc/medic
115115
name = "Weyland-Yutani PMC (Corporate Medic)"
116116
flags = EQUIPMENT_PRESET_EXTRA
117117
assignment = JOB_PMC_MEDIC
118118
rank = JOB_PMC_MEDIC
119119
paygrades = list(PAY_SHORT_PMC_MS = JOB_PLAYTIME_TIER_0)
120120
skills = /datum/skills/pmc/medic
121121

122-
/datum/equipment_preset/pmc/pmc_medic/load_gear(mob/living/carbon/human/new_human)
122+
/datum/equipment_preset/pmc/medic/load_gear(mob/living/carbon/human/new_human)
123123
//back
124124
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK)
125125
new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK)
@@ -173,7 +173,7 @@
173173

174174
//*****************************************************************************************************/
175175

176-
/datum/equipment_preset/pmc/pmc_leader
176+
/datum/equipment_preset/pmc/leader
177177
name = "Weyland-Yutani PMC (Leader)"
178178
flags = EQUIPMENT_PRESET_EXTRA
179179

@@ -183,11 +183,11 @@
183183
role_comm_title = "SL"
184184
skills = /datum/skills/pmc/SL
185185

186-
/datum/equipment_preset/pmc/pmc_leader/New()
186+
/datum/equipment_preset/pmc/leader/New()
187187
. = ..()
188188
access = get_access(ACCESS_LIST_WY_PMC) + list(ACCESS_WY_LEADERSHIP, ACCESS_WY_PMC_TL)
189189

190-
/datum/equipment_preset/pmc/pmc_leader/load_gear(mob/living/carbon/human/new_human)
190+
/datum/equipment_preset/pmc/leader/load_gear(mob/living/carbon/human/new_human)
191191
//back
192192
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK)
193193
new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_BACK)
@@ -243,7 +243,7 @@
243243

244244
//*****************************************************************************************************/
245245

246-
/datum/equipment_preset/pmc/pmc_gunner
246+
/datum/equipment_preset/pmc/gunner
247247
name = "Weyland-Yutani PMC (Gunner)"
248248
flags = EQUIPMENT_PRESET_EXTRA
249249

@@ -253,7 +253,7 @@
253253
role_comm_title = "SG"
254254
skills = /datum/skills/pmc/smartgunner
255255

256-
/datum/equipment_preset/pmc/pmc_gunner/load_gear(mob/living/carbon/human/new_human)
256+
/datum/equipment_preset/pmc/gunner/load_gear(mob/living/carbon/human/new_human)
257257
//TODO: add backpacks and satchels
258258
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc, WEAR_L_EAR)
259259
//face
@@ -292,7 +292,7 @@
292292

293293
//*****************************************************************************************************/
294294

295-
/datum/equipment_preset/pmc/pmc_sniper
295+
/datum/equipment_preset/pmc/sniper
296296
name = "Weyland-Yutani PMC (Sniper)"
297297
flags = EQUIPMENT_PRESET_EXTRA
298298

@@ -302,7 +302,7 @@
302302
role_comm_title = "Spc"
303303
skills = /datum/skills/pmc/specialist
304304

305-
/datum/equipment_preset/pmc/pmc_sniper/load_gear(mob/living/carbon/human/new_human)
305+
/datum/equipment_preset/pmc/sniper/load_gear(mob/living/carbon/human/new_human)
306306
//back
307307
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK)
308308
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39, WEAR_IN_BACK)
@@ -347,15 +347,15 @@
347347
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_sniper, WEAR_L_STORE)
348348
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_R_STORE)
349349
//*****************************************************************************************************/
350-
/datum/equipment_preset/pmc/pmc_crewman
350+
/datum/equipment_preset/pmc/crewman
351351
name = "Weyland-Yutani PMC (Crewman)"
352352
flags = EQUIPMENT_PRESET_EXTRA
353353
assignment = JOB_PMC_CREWMAN
354354
rank = JOB_PMC_CREWMAN
355355
paygrades = list(PAY_SHORT_PMC_VS = JOB_PLAYTIME_TIER_0)
356356
skills = /datum/skills/pmc/tank_crew
357357

358-
/datum/equipment_preset/pmc/pmc_crewman/load_gear(mob/living/carbon/human/new_human)
358+
/datum/equipment_preset/pmc/crewman/load_gear(mob/living/carbon/human/new_human)
359359
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc, WEAR_L_EAR)
360360
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/rmc/knife, WEAR_FEET)
361361
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY)

‎code/modules/mob/living/carbon/human/ai/action_datums/sniper_nest.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
/datum/equipment_preset/clf/soldier/svd::name = /datum/equipment_preset/clf/soldier/svd,
7777
/datum/equipment_preset/rebel/sniper::name = /datum/equipment_preset/rebel/sniper,
7878
/datum/equipment_preset/canc/remnant/marksman::name = /datum/equipment_preset/canc/remnant/marksman,
79-
/datum/equipment_preset/pmc/pmc_sniper::name = /datum/equipment_preset/pmc/pmc_sniper,
79+
/datum/equipment_preset/pmc/sniper::name = /datum/equipment_preset/pmc/sniper,
8080
/datum/equipment_preset/upp/sniper::name = /datum/equipment_preset/upp/sniper,
8181
/datum/equipment_preset/uscm/specialist_equipped/sniper::name = /datum/equipment_preset/uscm/specialist_equipped/sniper,
8282
/datum/equipment_preset/other/freelancer/marksman::name = /datum/equipment_preset/other/freelancer/marksman,

‎code/modules/mob/living/carbon/human/ai/squad_spawner/squad_pmc.dm

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,29 @@
55
name = "PMC Rifle Team"
66
desc = "A patrol group of 2 Standard PMCs."
77
ai_to_spawn = list(
8-
/datum/equipment_preset/pmc/pmc_standard = 2,
8+
/datum/equipment_preset/pmc/standard = 2,
99
)
1010

1111
/datum/human_ai_squad_preset/pmc/gunteam
1212
name = "PMC, Gun Team"
1313
desc = "A PMC squad, with support elements and a leader."
1414
ai_to_spawn = list(
15-
/datum/equipment_preset/pmc/pmc_standard = 1,
16-
/datum/equipment_preset/pmc/pmc_gunner = 1,
15+
/datum/equipment_preset/pmc/standard = 1,
16+
/datum/equipment_preset/pmc/gunner = 1,
1717
)
1818

1919
/datum/human_ai_squad_preset/pmc/squad
2020
name = "PMC, Squad"
2121
desc = "A PMC squad, with support elements, a heavy smartgunner, and a leader. Use carefully."
2222
ai_to_spawn = list(
23-
/datum/equipment_preset/pmc/pmc_standard = 2,
24-
/datum/equipment_preset/pmc/pmc_gunner = 1,
25-
/datum/equipment_preset/pmc/pmc_leader = 1,
23+
/datum/equipment_preset/pmc/standard = 2,
24+
/datum/equipment_preset/pmc/gunner = 1,
25+
/datum/equipment_preset/pmc/leader = 1,
2626
)
2727

2828
/datum/human_ai_squad_preset/pmc/medical
2929
name = "PMC, Medical Element"
3030
desc = "A PMC medical element with 2 medics."
3131
ai_to_spawn = list(
32-
/datum/equipment_preset/pmc/pmc_medic = 2,
32+
/datum/equipment_preset/pmc/medic = 2,
3333
)

0 commit comments

Comments
 (0)