diff --git a/code/modules/background/citizenship/skrell.dm b/code/modules/background/citizenship/skrell.dm index 17146f508b6..ddc06f8db80 100644 --- a/code/modules/background/citizenship/skrell.dm +++ b/code/modules/background/citizenship/skrell.dm @@ -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) diff --git a/code/modules/background/citizenship/unathi.dm b/code/modules/background/citizenship/unathi.dm index 51c7cc8cfba..12320cbd71c 100644 --- a/code/modules/background/citizenship/unathi.dm +++ b/code/modules/background/citizenship/unathi.dm @@ -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 diff --git a/code/modules/background/citizenship/vaurca.dm b/code/modules/background/citizenship/vaurca.dm index 9224f9d0474..8a1e7f0be44 100644 --- a/code/modules/background/citizenship/vaurca.dm +++ b/code/modules/background/citizenship/vaurca.dm @@ -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 diff --git a/html/changelogs/hazelmouse-bugfix!.yml b/html/changelogs/hazelmouse-bugfix!.yml new file mode 100644 index 00000000000..b4caaf07b33 --- /dev/null +++ b/html/changelogs/hazelmouse-bugfix!.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# 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. +# +# 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.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: hazelmouse + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# 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. +changes: + - bugfix: "Vaurca Consulars with Federation or Hegemony citizenships now properly spawn with thermic blasters on their belt slot." + - bugfix: "Vaurca Consulars with C'thur or K'lax citizenships no longer spawn with an energy pistol in addition to their thermic blaster."