Skip to content

Commit b8d662d

Browse files
authored
Vaurca Consular gun fixes (Aurorastation#20316)
Vaurca consulars of all available citizenships (Zo'ra, C'thur, K'lax, Biesel, Federation, Hegemony) now consistently spawn with a thermic blaster on their belt slot, and no other guns.
1 parent 9d4c5a9 commit b8d662d

File tree

4 files changed

+77
-5
lines changed

4 files changed

+77
-5
lines changed

code/modules/background/citizenship/skrell.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/vaurca/filter(H), slot_wear_mask)
107107
H.equip_to_slot_or_del(new /obj/item/clothing/suit/vaurca/breeder/cthur(H), slot_wear_suit)
108108
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/cthur(H), slot_back)
109-
H.equip_to_slot_or_del(new /obj/item/gun/energy/fedpistol/nopsi(H), slot_belt)
109+
H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_belt) // Federation Ta Consulars get a Thermic Blaster.
110110
else
111111
H.equip_to_slot_or_del(new /obj/item/gun/energy/fedpistol/nopsi(H), slot_belt)
112112
if(!visualsOnly)

code/modules/background/citizenship/unathi.dm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191

9292
uniform = /obj/item/clothing/under/unathi
9393
backpack_contents = list(/obj/item/device/camera = 1)
94-
belt = /obj/item/gun/energy/pistol/hegemony
9594

9695
/obj/outfit/job/representative/consular/izweski/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
9796
if(H)
@@ -102,8 +101,10 @@
102101
H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/vaurca/filter(H), slot_wear_mask)
103102
H.equip_to_slot_or_del(new /obj/item/clothing/suit/vaurca/breeder/klax(H), slot_wear_suit)
104103
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/klax(H), slot_back)
104+
H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_belt) // Hegemony Ta Consulars get a Thermic Blaster.
105105
else
106106
H.equip_to_slot_or_del(new /obj/item/clothing/accessory/poncho/unathimantle(H), slot_wear_suit)
107+
H.equip_to_slot_or_del(new /obj/item/gun/energy/pistol/hegemony(H), slot_belt)
107108
if(!visualsOnly)
108109
addtimer(CALLBACK(src, .proc/send_representative_mission, H), 5 MINUTES)
109110
return TRUE

code/modules/background/citizenship/vaurca.dm

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,21 @@
6060
uniform = /obj/item/clothing/under/gearharness
6161

6262
glasses = null
63+
accessory = null
64+
suit_accessory = null
6365
head = /obj/item/clothing/head/vaurca_breeder
6466
shoes = /obj/item/clothing/shoes/vaurca/breeder
6567
mask = /obj/item/clothing/mask/gas/vaurca/filter
6668
suit = /obj/item/clothing/suit/vaurca/breeder
6769

70+
backpack_contents = list(/obj/item/device/camera = 1) // Redefined so they do not inherit the extra energy pistol from the parent representative outfit.
71+
6872
/obj/outfit/job/representative/consular/zora/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
6973
if(H)
7074
if(isvaurca(H))
7175
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec(H), slot_back)
7276
H.equip_to_slot_or_del(new /obj/item/storage/box/tcaf_pamphlet(H), slot_in_backpack)
73-
H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_in_backpack)
77+
H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_belt)
7478
if(!visualsOnly)
7579
addtimer(CALLBACK(src, PROC_REF(send_representative_mission), H), 5 MINUTES)
7680
return TRUE
@@ -134,16 +138,20 @@
134138
uniform = /obj/item/clothing/under/gearharness
135139

136140
glasses = null
141+
accessory = null
142+
suit_accessory = null
137143
head = /obj/item/clothing/head/vaurca_breeder/klax
138144
shoes = /obj/item/clothing/shoes/vaurca/breeder/klax
139145
mask = /obj/item/clothing/mask/gas/vaurca/filter
140146
suit = /obj/item/clothing/suit/vaurca/breeder/klax
141147

148+
backpack_contents = list(/obj/item/device/camera = 1) // Redefined so they do not inherit the extra energy pistol from the parent representative outfit.
149+
142150
/obj/outfit/job/representative/consular/klax/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
143151
if(H)
144152
if(isvaurca(H))
145153
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/klax(H), slot_back)
146-
H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_in_backpack)
154+
H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_belt)
147155
if(!visualsOnly)
148156
addtimer(CALLBACK(src, PROC_REF(send_representative_mission), H), 5 MINUTES)
149157
return TRUE
@@ -208,16 +216,20 @@
208216
uniform = /obj/item/clothing/under/gearharness
209217

210218
glasses = null
219+
accessory = null
220+
suit_accessory = null
211221
head = /obj/item/clothing/head/vaurca_breeder/cthur
212222
shoes = /obj/item/clothing/shoes/vaurca/breeder/cthur
213223
mask = /obj/item/clothing/mask/gas/vaurca/filter
214224
suit = /obj/item/clothing/suit/vaurca/breeder/cthur
215225

226+
backpack_contents = list(/obj/item/device/camera = 1) // Redefined so they do not inherit the extra energy pistol from the parent representative outfit.
227+
216228
/obj/outfit/job/representative/consular/cthur/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
217229
if(H)
218230
if(isvaurca(H))
219231
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/cthur(H), slot_back)
220-
H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_in_backpack)
232+
H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_belt)
221233
if(!visualsOnly)
222234
addtimer(CALLBACK(src, PROC_REF(send_representative_mission), H), 5 MINUTES)
223235
return TRUE
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
################################
2+
# Example Changelog File
3+
#
4+
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
5+
#
6+
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
7+
# When it is, any changes listed below will disappear.
8+
#
9+
# Valid Prefixes:
10+
# bugfix
11+
# - (fixes bugs)
12+
# wip
13+
# - (work in progress)
14+
# qol
15+
# - (quality of life)
16+
# soundadd
17+
# - (adds a sound)
18+
# sounddel
19+
# - (removes a sound)
20+
# rscadd
21+
# - (adds a feature)
22+
# rscdel
23+
# - (removes a feature)
24+
# imageadd
25+
# - (adds an image or sprite)
26+
# imagedel
27+
# - (removes an image or sprite)
28+
# spellcheck
29+
# - (fixes spelling or grammar)
30+
# experiment
31+
# - (experimental change)
32+
# balance
33+
# - (balance changes)
34+
# code_imp
35+
# - (misc internal code change)
36+
# refactor
37+
# - (refactors code)
38+
# config
39+
# - (makes a change to the config files)
40+
# admin
41+
# - (makes changes to administrator tools)
42+
# server
43+
# - (miscellaneous changes to server)
44+
#################################
45+
46+
# Your name.
47+
author: hazelmouse
48+
49+
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
50+
delete-after: True
51+
52+
# Any changes you've made. See valid prefix list above.
53+
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
54+
# SCREW THIS UP AND IT WON'T WORK.
55+
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
56+
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
57+
changes:
58+
- bugfix: "Vaurca Consulars with Federation or Hegemony citizenships now properly spawn with thermic blasters on their belt slot."
59+
- bugfix: "Vaurca Consulars with C'thur or K'lax citizenships no longer spawn with an energy pistol in addition to their thermic blaster."

0 commit comments

Comments
 (0)