Skip to content

Commit

Permalink
Fixes post_equip for engineering and security shoes and gloves (Auror…
Browse files Browse the repository at this point in the history
…astation#15868)

* Fixes post_equip for engineering and security shoes and gloves

* Update code/game/jobs/job/security.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
  • Loading branch information
alsoandanswer and SleepyGemmy authored Feb 22, 2023
1 parent 8816e80 commit c4954a4
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 2 deletions.
4 changes: 3 additions & 1 deletion code/game/jobs/job/engineering.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
head = /obj/item/clothing/head/hardhat/white
belt = /obj/item/storage/belt/utility/ce
id = /obj/item/card/id/navy
shoes = /obj/item/clothing/shoes/workboots
shoes = null
r_pocket = /obj/item/device/t_scanner

headset = /obj/item/device/radio/headset/heads/ce
Expand Down Expand Up @@ -108,6 +108,7 @@
head = /obj/item/clothing/head/hardhat
belt = /obj/item/storage/belt/utility
id = /obj/item/card/id/silver
shoes = null
r_pocket = /obj/item/device/t_scanner

headset = /obj/item/device/radio/headset/headset_eng
Expand Down Expand Up @@ -173,6 +174,7 @@
uniform = /obj/item/clothing/under/rank/atmospheric_technician
belt = /obj/item/storage/belt/utility
id = /obj/item/card/id/silver
shoes = null

headset = /obj/item/device/radio/headset/headset_eng
bowman = /obj/item/device/radio/headset/headset_eng/alt
Expand Down
11 changes: 10 additions & 1 deletion code/game/jobs/job/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
uniform = /obj/item/clothing/under/rank/head_of_security
head = /obj/item/clothing/head/hos
id = /obj/item/card/id/navy
shoes = null
glasses = /obj/item/clothing/glasses/sunglasses/sechud/head

headset = /obj/item/device/radio/headset/heads/hos
Expand Down Expand Up @@ -103,6 +104,8 @@
uniform = /obj/item/clothing/under/rank/warden
suit = /obj/item/clothing/suit/storage/toggle/warden
glasses = /obj/item/clothing/glasses/sunglasses/sechud/aviator
shoes = null
l_pocket = /obj/item/device/flash

headset = /obj/item/device/radio/headset/headset_warden
bowman = /obj/item/device/radio/headset/headset_warden/alt
Expand Down Expand Up @@ -160,7 +163,6 @@

uniform = /obj/item/clothing/under/det
shoes = /obj/item/clothing/shoes/laceup/all_species
gloves = /obj/item/clothing/gloves/black/forensic

headset = /obj/item/device/radio/headset/headset_sec
bowman = /obj/item/device/radio/headset/headset_sec/alt
Expand All @@ -180,6 +182,10 @@
/obj/item/storage/box/evidence = 1
)

/datum/outfit/job/forensics/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
H.equip_or_collect(new /obj/item/clothing/gloves/black/forensic(H), slot_gloves)

/datum/job/officer
title = "Security Officer"
flag = OFFICER
Expand Down Expand Up @@ -210,6 +216,8 @@
jobtype = /datum/job/officer

uniform = /obj/item/clothing/under/rank/security
l_pocket = /obj/item/device/flash
shoes = null

headset = /obj/item/device/radio/headset/headset_sec
bowman = /obj/item/device/radio/headset/headset_sec/alt
Expand Down Expand Up @@ -265,6 +273,7 @@
uniform = /obj/item/clothing/under/rank/cadet
suit = /obj/item/clothing/suit/storage/hazardvest/security
head = /obj/item/clothing/head/beret/security
shoes = null

headset = /obj/item/device/radio/headset/headset_sec
bowman = /obj/item/device/radio/headset/headset_sec/alt
Expand Down
42 changes: 42 additions & 0 deletions html/changelogs/wezzy_fixafterequip.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
################################
# 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
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################

# Your name.
author: Wowzewow (Wezzy)

# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "Fixes post_equip for engineering and security shoes."
- bugfix: "Forensic tech gloves now spawn in backpacks rather than being overwritten."

0 comments on commit c4954a4

Please sign in to comment.