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

Investigator Jacket Fixes (#15164)

Browse Source
This commit is contained in:
SleepyGemmy
2022-11-23 23:16:01 -03:00
committed by GitHub
parent 422cb7228b
commit ddeee1f26f
7 changed files with 52 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/faction/idris.dm
+1 -1
View File
@@ -80,7 +80,7 @@
name = "Investigator - Idris"
uniform = /obj/item/clothing/under/det/idris
suit = /obj/item/clothing/suit/storage/det_jacket/idris
suit = /obj/item/clothing/suit/storage/security/investigator/idris
id = /obj/item/card/id/idris/sec
backpack_faction = /obj/item/storage/backpack/idris
code/game/jobs/faction/pmc.dm
+1 -1
View File
@@ -91,7 +91,7 @@
name = "Investigator - PMC"
uniform = /obj/item/clothing/under/det/pmc
suit = /obj/item/clothing/suit/storage/det_jacket/pmc
suit = /obj/item/clothing/suit/storage/security/investigator/pmc
id = /obj/item/card/id/pmc
backpack_faction = /obj/item/storage/backpack/pmcg
code/game/jobs/faction/zavodskoi.dm
+1 -1
View File
@@ -101,7 +101,7 @@
id = /obj/item/card/id/zavodskoi/sec
uniform = /obj/item/clothing/under/det/zavod
suit = /obj/item/clothing/suit/storage/det_jacket/zavod
suit = /obj/item/clothing/suit/storage/security/investigator/zavod
backpack_faction = /obj/item/storage/backpack/zavod
satchel_faction = /obj/item/storage/backpack/satchel/zavod
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+1 -3
View File
@@ -113,7 +113,7 @@
new /obj/item/clothing/head/helmet/hos(src)
new /obj/item/clothing/accessory/badge/hos(src)
new /obj/item/clothing/gloves/black_leather(src)
new /obj/item/clothing/suit/storage/security/officer/hos(src)
new /obj/item/clothing/suit/storage/security/hos(src)
new /obj/item/clothing/mask/gas/alt(src)
new /obj/item/clothing/mask/gas/half(src)
//Tools
@@ -275,14 +275,12 @@
/obj/structure/closet/secure_closet/investigator/fill()
//Appearance
new /obj/item/storage/backpack/satchel/leather/recolorable(src)
new /obj/item/clothing/suit/storage/det_jacket(src)
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
new /obj/item/clothing/under/det(src)
new /obj/item/clothing/under/det/idris(src)
new /obj/item/clothing/under/det/pmc(src)
new /obj/item/clothing/under/det/zavod(src)
new /obj/item/clothing/accessory/badge/investigator(src)
new /obj/item/clothing/suit/storage/toggle/forensics(src)
new /obj/item/clothing/gloves/black/forensic(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/laceup(src)
code/modules/clothing/suits/jobs.dm
+41 -57
View File
@@ -102,14 +102,22 @@ obj/item/clothing/suit/apron/overalls/blue
no_overheat = TRUE
//Security
/obj/item/clothing/suit/storage/security
name = "security jacket parent item"
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
contained_sprite = TRUE
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO | LOWER_TORSO | ARMS
/obj/item/clothing/suit/storage/security/hos
name = "head of security jacket"
desc = "This piece of clothing was specifically designed for asserting superior authority."
icon_state = "hos_jacket"
item_state = "hos_jacket"
/obj/item/clothing/suit/storage/security/officer
name = "corporate security jacket"
desc = "This jacket is for those special occasions when corporate security actually feels safe."
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
contained_sprite = TRUE
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/suit/storage/security/officer/zav
icon_state = "zav_jacket"
@@ -135,73 +143,37 @@ obj/item/clothing/suit/apron/overalls/blue
icon_state = "pmc_jacket_alt"
item_state = "pmc_jacket_alt"
/obj/item/clothing/suit/storage/security/officer/hos
name = "head of security's jacket"
desc = "This piece of clothing was specifically designed for asserting superior authority."
icon_state = "hos_jacket"
item_state = "hos_jacket"
//Detective
/obj/item/clothing/suit/storage/det_jacket
name = "detective's jacket"
desc = "Stylish yet comfortable professional jacket manufactured by CL corporation for detectives."
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
/obj/item/clothing/suit/storage/security/investigator
name = "investigator jacket"
desc = "An investigator jacket. Stylish, professional, yet comfortable."
icon_state = "nt_invest_coat"
item_state = "nt_invest_coat"
contained_sprite = TRUE
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|ARMS
allowed = list(/obj/item/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/box/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/device/taperecorder,/obj/item/clothing/accessory/badge/investigator)
allowed = list(
/obj/item/tank/emergency_oxygen,
/obj/item/device/flashlight,
/obj/item/gun/energy,
/obj/item/gun/projectile,
/obj/item/melee/baton,
/obj/item/device/taperecorder,
/obj/item/clothing/accessory/badge/investigator
)
/obj/item/clothing/suit/storage/det_jacket/zavod
/obj/item/clothing/suit/storage/security/investigator/zavod
icon_state = "zav_invest_coat"
item_state = "zav_invest_coat"
/obj/item/clothing/suit/storage/det_jacket/pmc
/obj/item/clothing/suit/storage/security/investigator/pmc
icon_state = "pmc_invest_coat"
item_state = "pmc_invest_coat"
/obj/item/clothing/suit/storage/det_jacket/idris
/obj/item/clothing/suit/storage/security/investigator/idris
icon_state = "idris_invest_coat"
item_state = "idris_invest_coat"
/obj/item/clothing/suit/storage/toggle/det_trench
name = "brown trenchcoat"
desc = "A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. Perfect for your next act of autodefenestration!"
icon_state = "detective"
item_state = "detective"
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|ARMS
allowed = list(/obj/item/tank/emergency_oxygen,/obj/item/device/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/box/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/device/taperecorder,/obj/item/clothing/accessory/badge/investigator)
/obj/item/clothing/suit/storage/toggle/det_trench/black
name = "black trenchcoat"
icon_state = "detective2"
//Forensics
/obj/item/clothing/suit/storage/toggle/forensics
name = "forensic technician's jacket"
desc = "A jacket for the slick, on the beat sleuth."
icon_state = "forensics"
item_state = "forensics"
body_parts_covered = UPPER_TORSO|ARMS
allowed = list(/obj/item/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/box/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/device/taperecorder,/obj/item/clothing/accessory/badge/investigator)
/obj/item/clothing/suit/storage/toggle/forensics/blue
icon_state = "forensicsblue"
item_state = "forensicsblue"
/obj/item/clothing/suit/storage/toggle/forensics/dnavy
icon_state = "forensicsdnavy"
item_state = "forensicsdnavy"
//Corporate
/obj/item/clothing/suit/storage/toggle/warden
name = "warden's coat"
name = "warden coat"
desc = "A thick, rugged overcoat, with corporate livery emblazoned on it."
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
body_parts_covered = UPPER_TORSO | LOWER_TORSO | ARMS | LEGS
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "nt_warden_coat"
item_state = "nt_warden_coat"
@@ -220,6 +192,18 @@ obj/item/clothing/suit/apron/overalls/blue
icon_state = "idris_warden_coat"
item_state = "idris_warden_coat"
/obj/item/clothing/suit/storage/toggle/det_trench // Not security anymore, but used in the loadout.
name = "brown trenchcoat"
desc = "A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. Perfect for your next act of autodefenestration!"
icon_state = "detective"
item_state = "detective"
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|ARMS
allowed = list(/obj/item/tank/emergency_oxygen,/obj/item/device/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/box/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/device/taperecorder,/obj/item/clothing/accessory/badge/investigator)
/obj/item/clothing/suit/storage/toggle/det_trench/black
name = "black trenchcoat"
icon_state = "detective2"
//Lawyer
code/modules/customitems/item_defines.dm
+1
View File
@@ -87,6 +87,7 @@ All custom items with worn sprites must follow the contained sprite system: http
icon_state = "ana_jacket"
item_state = "ana_jacket"
contained_sprite = TRUE
body_parts_covered = UPPER_TORSO | ARMS
/obj/item/clothing/accessory/badge/old/fluff/ana_badge //Faded Badge - Ana Roh'hi'tin - suethecake
name = "faded badge"
html/changelogs/investigator_jacket.yml
+6
View File
@@ -0,0 +1,6 @@
author: SleepyGemmy
delete-after: True
changes:
- bugfix: "Removes the unused investigator jacket."