From 7af3db89396dbea55110f3d1fd7f8c4adeb76a9d Mon Sep 17 00:00:00 2001 From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com> Date: Wed, 15 Feb 2023 04:59:33 +0800 Subject: [PATCH] Uniform QOL (#15781) --- code/game/jobs/job/engineering.dm | 29 ++++++++-- code/game/jobs/job/security.dm | 55 +++++++++++++++++-- .../crates_lockers/closets/secure/security.dm | 9 +-- html/changelogs/wezzy_xeno-sec-qol.yml | 42 ++++++++++++++ 4 files changed, 119 insertions(+), 16 deletions(-) create mode 100644 html/changelogs/wezzy_xeno-sec-qol.yml diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 6523b6fd215..ac3050e51f5 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -66,11 +66,14 @@ /datum/outfit/job/chief_engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(istajara(H)) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black/tajara(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/workboots/toeless(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow/specialt(H), slot_gloves) else if(isunathi(H)) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black/unathi(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/workboots/toeless(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow/specialu(H), slot_gloves) else - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/workboots(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), slot_gloves) /datum/job/engineer title = "Engineer" @@ -105,7 +108,6 @@ head = /obj/item/clothing/head/hardhat belt = /obj/item/storage/belt/utility id = /obj/item/card/id/silver - shoes = /obj/item/clothing/shoes/workboots r_pocket = /obj/item/device/t_scanner headset = /obj/item/device/radio/headset/headset_eng @@ -130,6 +132,15 @@ /obj/item/powerdrill = 1 ) +/datum/outfit/job/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(istajara(H)) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/workboots/toeless(H), slot_shoes) + else if(isunathi(H)) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/workboots/toeless(H), slot_shoes) + else + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/workboots(H), slot_shoes) + /datum/job/atmos title = "Atmospheric Technician" flag = ATMOSTECH @@ -162,7 +173,6 @@ uniform = /obj/item/clothing/under/rank/atmospheric_technician belt = /obj/item/storage/belt/utility id = /obj/item/card/id/silver - shoes = /obj/item/clothing/shoes/workboots headset = /obj/item/device/radio/headset/headset_eng bowman = /obj/item/device/radio/headset/headset_eng/alt @@ -188,6 +198,15 @@ /obj/item/powerdrill = 1 ) +/datum/outfit/job/atmos/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(istajara(H)) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/workboots/toeless(H), slot_shoes) + else if(isunathi(H)) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/workboots/toeless(H), slot_shoes) + else + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/workboots(H), slot_shoes) + /datum/job/intern_eng title = "Engineering Apprentice" flag = INTERN_ENG diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index de64fdb717d..a902ffb56af 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -38,7 +38,6 @@ uniform = /obj/item/clothing/under/rank/head_of_security head = /obj/item/clothing/head/hos - shoes = /obj/item/clothing/shoes/jackboots id = /obj/item/card/id/navy glasses = /obj/item/clothing/glasses/sunglasses/sechud/head l_pocket = /obj/item/device/flash @@ -65,6 +64,18 @@ dufflebag = /obj/item/storage/backpack/duffel/hos messengerbag = /obj/item/storage/backpack/messenger/hos +/datum/outfit/job/hos/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(istajara(H)) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots/toeless(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black_leather/tajara(H), slot_gloves) + else if(isunathi(H)) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots/toeless(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black_leather/unathi(H), slot_gloves) + else + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black_leather(H), slot_gloves) + /datum/job/warden title = "Warden" flag = WARDEN @@ -96,7 +107,6 @@ uniform = /obj/item/clothing/under/rank/warden suit = /obj/item/clothing/suit/storage/toggle/warden - shoes = /obj/item/clothing/shoes/jackboots glasses = /obj/item/clothing/glasses/sunglasses/sechud/aviator l_pocket = /obj/item/device/flash @@ -118,6 +128,18 @@ /obj/item/handcuffs = 1 ) +/datum/outfit/job/warden/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(istajara(H)) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots/toeless(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black_leather/tajara(H), slot_gloves) + else if(isunathi(H)) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots/toeless(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black_leather/unathi(H), slot_gloves) + else + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black_leather(H), slot_gloves) + /datum/job/investigator title = "Investigator" flag = FORENSICS @@ -147,7 +169,8 @@ jobtype = /datum/job/investigator uniform = /obj/item/clothing/under/det - shoes = /obj/item/clothing/shoes/laceup + 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 @@ -197,7 +220,6 @@ jobtype = /datum/job/officer uniform = /obj/item/clothing/under/rank/security - shoes = /obj/item/clothing/shoes/jackboots l_pocket = /obj/item/device/flash headset = /obj/item/device/radio/headset/headset_sec @@ -218,6 +240,18 @@ /obj/item/handcuffs = 1 ) +/datum/outfit/job/officer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(istajara(H)) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots/toeless(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black_leather/tajara(H), slot_gloves) + else if(isunathi(H)) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots/toeless(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black_leather/unathi(H), slot_gloves) + else + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black_leather(H), slot_gloves) + /datum/job/intern_sec title = "Security Cadet" flag = INTERN_SEC @@ -246,7 +280,6 @@ uniform = /obj/item/clothing/under/rank/cadet suit = /obj/item/clothing/suit/storage/hazardvest/security head = /obj/item/clothing/head/beret/security - shoes = /obj/item/clothing/shoes/jackboots headset = /obj/item/device/radio/headset/headset_sec bowman = /obj/item/device/radio/headset/headset_sec/alt @@ -261,3 +294,15 @@ tab_pda = /obj/item/modular_computer/handheld/pda/security wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/security tablet = /obj/item/modular_computer/handheld/preset/security + +/datum/outfit/job/intern_sec/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(istajara(H)) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots/toeless(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black_leather/tajara(H), slot_gloves) + else if(isunathi(H)) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots/toeless(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black_leather/unathi(H), slot_gloves) + else + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black_leather(H), slot_gloves) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 2435550eed6..a9e3b882118 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -112,7 +112,6 @@ new /obj/item/clothing/accessory/arm_guard(src) 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/hos(src) new /obj/item/clothing/mask/gas/alt(src) new /obj/item/clothing/mask/gas/half(src) @@ -181,7 +180,6 @@ new /obj/item/clothing/accessory/leg_guard(src) new /obj/item/clothing/head/helmet/security(src) new /obj/item/clothing/accessory/badge/warden(src) - new /obj/item/clothing/gloves/black_leather(src) new /obj/item/clothing/mask/gas/alt(src) new /obj/item/clothing/mask/gas/half(src) //Tools @@ -281,9 +279,8 @@ 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/gloves/black/forensic(src) - new /obj/item/clothing/shoes/brown(src) - new /obj/item/clothing/shoes/laceup(src) + new /obj/item/clothing/shoes/laceup/all_species(src) + new /obj/item/clothing/shoes/laceup/all_species(src) //Tools new /obj/item/device/radio/headset/headset_sec(src) new /obj/item/device/radio/headset/headset_sec/alt(src) @@ -374,4 +371,4 @@ name = "contraband weapons and ammunition storage locker" anchored = TRUE canbemoved = TRUE - req_access = list(access_armory) \ No newline at end of file + req_access = list(access_armory) diff --git a/html/changelogs/wezzy_xeno-sec-qol.yml b/html/changelogs/wezzy_xeno-sec-qol.yml new file mode 100644 index 00000000000..3e316d9857b --- /dev/null +++ b/html/changelogs/wezzy_xeno-sec-qol.yml @@ -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: + - rscadd: "Security jobs now start with black gloves as part of their default loadout. Tajarans and Unathi should spawn with toeless boots depending on their job." + - rscadd: "The Chief Engineer spawns with insuls now."