cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 05:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Vaurca Consular gun fixes (#20316)

Browse Source 
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.
This commit is contained in:
hazelrat
2025-01-01 16:38:40 +00:00
committed by GitHub
parent 9d4c5a9ace
commit b8d662df8b
4 changed files with 77 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/background/citizenship/skrell.dm
+1 -1
View File
@@ -106,7 +106,7 @@
H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/vaurca/filter(H), slot_wear_mask)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/vaurca/breeder/cthur(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/cthur(H), slot_back)
H.equip_to_slot_or_del(new /obj/item/gun/energy/fedpistol/nopsi(H), slot_belt)
H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_belt) // Federation Ta Consulars get a Thermic Blaster.
else
H.equip_to_slot_or_del(new /obj/item/gun/energy/fedpistol/nopsi(H), slot_belt)
if(!visualsOnly)
code/modules/background/citizenship/unathi.dm
+2 -1
View File
@@ -91,7 +91,6 @@
uniform = /obj/item/clothing/under/unathi
backpack_contents = list(/obj/item/device/camera = 1)
belt = /obj/item/gun/energy/pistol/hegemony
/obj/outfit/job/representative/consular/izweski/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H)
@@ -102,8 +101,10 @@
H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/vaurca/filter(H), slot_wear_mask)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/vaurca/breeder/klax(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/klax(H), slot_back)
H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_belt) // Hegemony Ta Consulars get a Thermic Blaster.
else
H.equip_to_slot_or_del(new /obj/item/clothing/accessory/poncho/unathimantle(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/gun/energy/pistol/hegemony(H), slot_belt)
if(!visualsOnly)
addtimer(CALLBACK(src, .proc/send_representative_mission, H), 5 MINUTES)
return TRUE
code/modules/background/citizenship/vaurca.dm
+15 -3
View File
@@ -60,17 +60,21 @@
uniform = /obj/item/clothing/under/gearharness
glasses = null
accessory = null
suit_accessory = null
head = /obj/item/clothing/head/vaurca_breeder
shoes = /obj/item/clothing/shoes/vaurca/breeder
mask = /obj/item/clothing/mask/gas/vaurca/filter
suit = /obj/item/clothing/suit/vaurca/breeder
backpack_contents = list(/obj/item/device/camera = 1) // Redefined so they do not inherit the extra energy pistol from the parent representative outfit.
/obj/outfit/job/representative/consular/zora/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H)
if(isvaurca(H))
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec(H), slot_back)
H.equip_to_slot_or_del(new /obj/item/storage/box/tcaf_pamphlet(H), slot_in_backpack)
H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_in_backpack)
H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_belt)
if(!visualsOnly)
addtimer(CALLBACK(src, PROC_REF(send_representative_mission), H), 5 MINUTES)
return TRUE
@@ -134,16 +138,20 @@
uniform = /obj/item/clothing/under/gearharness
glasses = null
accessory = null
suit_accessory = null
head = /obj/item/clothing/head/vaurca_breeder/klax
shoes = /obj/item/clothing/shoes/vaurca/breeder/klax
mask = /obj/item/clothing/mask/gas/vaurca/filter
suit = /obj/item/clothing/suit/vaurca/breeder/klax
backpack_contents = list(/obj/item/device/camera = 1) // Redefined so they do not inherit the extra energy pistol from the parent representative outfit.
/obj/outfit/job/representative/consular/klax/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H)
if(isvaurca(H))
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/klax(H), slot_back)
H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_in_backpack)
H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_belt)
if(!visualsOnly)
addtimer(CALLBACK(src, PROC_REF(send_representative_mission), H), 5 MINUTES)
return TRUE
@@ -208,16 +216,20 @@
uniform = /obj/item/clothing/under/gearharness
glasses = null
accessory = null
suit_accessory = null
head = /obj/item/clothing/head/vaurca_breeder/cthur
shoes = /obj/item/clothing/shoes/vaurca/breeder/cthur
mask = /obj/item/clothing/mask/gas/vaurca/filter
suit = /obj/item/clothing/suit/vaurca/breeder/cthur
backpack_contents = list(/obj/item/device/camera = 1) // Redefined so they do not inherit the extra energy pistol from the parent representative outfit.
/obj/outfit/job/representative/consular/cthur/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H)
if(isvaurca(H))
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/cthur(H), slot_back)
H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_in_backpack)
H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_belt)
if(!visualsOnly)
addtimer(CALLBACK(src, PROC_REF(send_representative_mission), H), 5 MINUTES)
return TRUE