From f778ee5232f3c96749e678dc008586167bf42e3e Mon Sep 17 00:00:00 2001 From: naut <55491249+nauticall@users.noreply.github.com> Date: Mon, 25 Dec 2023 07:28:25 +0800 Subject: [PATCH] CCIA HRA makeover (#18029) * fixes * Auto equips holster + fixes suit open state * aviator sunglasses --- code/game/jobs/job/hra.dm | 27 ++++++++--- code/modules/cciaa/cciaa_items.dm | 2 +- code/modules/clothing/factions/scc.dm | 42 ++++++++++++++++++ html/changelogs/nauticall-ccia-makeover.yml | 42 ++++++++++++++++++ .../item/clothing/department_uniforms/scc.dmi | Bin 1909 -> 3833 bytes 5 files changed, 107 insertions(+), 6 deletions(-) create mode 100644 html/changelogs/nauticall-ccia-makeover.yml diff --git a/code/game/jobs/job/hra.dm b/code/game/jobs/job/hra.dm index f6c501ef2a6..590575c7b82 100644 --- a/code/game/jobs/job/hra.dm +++ b/code/game/jobs/job/hra.dm @@ -31,13 +31,15 @@ name = "Human Resources Assistant" jobtype = /datum/job/hra - uniform = /obj/item/clothing/under/rank/scc2 - suit = /obj/item/clothing/suit/storage/toggle/armor/vest/scc + uniform = /obj/item/clothing/under/rank/scc2/ccia + suit = /obj/item/clothing/suit/storage/toggle/armor/ccia shoes = /obj/item/clothing/shoes/laceup gloves = /obj/item/clothing/gloves/white - accessory = /obj/item/clothing/accessory/tie/corporate/scc - glasses = /obj/item/clothing/glasses/sunglasses/sechud - head = /obj/item/clothing/head/beret/scc + accessory = /obj/item/clothing/accessory/holster/waist + accessory_contents = list(/obj/item/gun/energy/repeater/pistol = 1) + glasses = /obj/item/clothing/glasses/sunglasses/sechud/aviator + head = /obj/item/clothing/head/beret/scc/alt + belt = /obj/item/melee/telebaton headset = /obj/item/device/radio/headset/representative bowman = /obj/item/device/radio/headset/representative/alt @@ -52,3 +54,18 @@ r_pocket = /obj/item/device/taperecorder/cciaa l_hand = /obj/item/storage/lockbox/cciaa id = /obj/item/card/id/gold + + + + backpack_contents = list( + /obj/item/modular_computer/laptop/preset/command = 1, + ) + +/datum/outfit/job/hra/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(H && H.w_uniform) + var/obj/item/clothing/under/U = H.w_uniform + var/obj/item/clothing/accessory/tie/corporate/scc/alt/tie = new() + U.attach_accessory(null, tie) + + return TRUE diff --git a/code/modules/cciaa/cciaa_items.dm b/code/modules/cciaa/cciaa_items.dm index 25351873c6c..b749633f07e 100644 --- a/code/modules/cciaa/cciaa_items.dm +++ b/code/modules/cciaa/cciaa_items.dm @@ -356,7 +356,7 @@ /obj/item/storage/lockbox/cciaa req_access = list(access_cent_ccia) name = "CCIA agent briefcase" - desc = "A smart looking briefcase with an SCC logo on the side" + desc = "A smart looking briefcase with an SCC logo on the side." storage_slots = 8 max_storage_space = 16 diff --git a/code/modules/clothing/factions/scc.dm b/code/modules/clothing/factions/scc.dm index 19a75411616..67cd42fe3c5 100644 --- a/code/modules/clothing/factions/scc.dm +++ b/code/modules/clothing/factions/scc.dm @@ -6,6 +6,12 @@ item_state = "scc_liaison" contained_sprite = TRUE +/obj/item/clothing/under/rank/scc2/ccia + name = "\improper SCC internal affairs uniform" + desc = "The ubiquitous well-ironed dress uniform of SCC internal affairs personnel." + icon_state = "scc_ccia" + item_state = "scc_ccia" + /obj/item/clothing/suit/storage/toggle/armor/vest/scc name = "\improper SCC vest" desc = "A stylish vest worn by SCC personnel." @@ -35,6 +41,33 @@ /obj/item/clothing/suit/storage/toggle/armor/vest/scc/toggle_open() return +/obj/item/clothing/suit/storage/toggle/armor/ccia + name = "\improper SCC CCIA armored jacket" + desc = "A long armored coat worn by SCC internal affairs personnel. Layered with armor lining for added protection." + icon = 'icons/obj/item/clothing/department_uniforms/scc.dmi' + icon_state = "scc_coat" + item_state = "scc_coat" + contained_sprite = TRUE + opened = TRUE + + allowed = list( + /obj/item/gun, + /obj/item/reagent_containers/spray/pepper, + /obj/item/ammo_magazine, + /obj/item/ammo_casing, + /obj/item/melee/baton, + /obj/item/handcuffs, + /obj/item/device/flashlight + ) + body_parts_covered = UPPER_TORSO|ARMS + armor = list( + melee = ARMOR_MELEE_KNIVES, + bullet = ARMOR_BALLISTIC_PISTOL, + laser = ARMOR_LASER_SMALL, + energy = ARMOR_ENERGY_MINOR, + bomb = ARMOR_BOMB_PADDED + ) + /obj/item/clothing/accessory/tie/corporate/scc name = "\improper SCC tie" desc = "A sleek corporate tie, worn by SCC employees." @@ -43,6 +76,10 @@ item_state = "scc_tie" contained_sprite = TRUE +/obj/item/clothing/accessory/tie/corporate/scc/alt + icon_state = "scc_tie_blue" + item_state = "scc_tie_blue" + /obj/item/clothing/head/beret/scc name = "\improper SCC beret" desc = "A corporate beret in the colours of the Stellar Corporate Conglomerate." @@ -51,3 +88,8 @@ icon_state = "scc_beret" item_state = "scc_beret" contained_sprite = TRUE + +/obj/item/clothing/head/beret/scc/alt + icon_state = "scc_beret_dark" + item_state = "scc_beret_dark" + diff --git a/html/changelogs/nauticall-ccia-makeover.yml b/html/changelogs/nauticall-ccia-makeover.yml new file mode 100644 index 00000000000..f5a41f8b63a --- /dev/null +++ b/html/changelogs/nauticall-ccia-makeover.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: nauticall + +# 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: "Revamped the CCIA Human Resources Asssistant to wear a more formal coat and tie. They now (subjectively) look twice as intimidating." + - rscadd: "CCIA HRAs now come with additional self-defense weaponry - a gun and a baton - as well as a holster for said gun and a laptop." diff --git a/icons/obj/item/clothing/department_uniforms/scc.dmi b/icons/obj/item/clothing/department_uniforms/scc.dmi index 654dfe6ba959a1248c9775280aac0fda617eeed6..03c27ef70cec7c557911088510e1efc9168d50c0 100644 GIT binary patch literal 3833 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 R{{bH=t{9_?N(`JM{tp=-PEP;; literal 1909 zcmV-*2a5QKP)<4WO99omz#7( z8o-q#t8W=lEgSKV=r*V(tN;K20d!JMQvg8b*k%9#0KIxtSad{Xb7OL8aCB*JZU6vy zoSl--3WG2V#?S3j6upoA@w&@UhKKnIrD|paPNAvp^;ea_1{;gJCE@qw`&tsKQ+Cb^ zm0of=f+OrZbyUe_E5#jaZ$op~OJM;U>z9VS@es<0s!F$Lkoqo?qDDtyx|8DS%ng?M z6RU?8Jo$~gwSp1IuL?8?Gz}~hkHFd;IBxCImxf&<>a&!o1% zU#p#60k>b_SY<^zANvDZ)#SNrd86L|00tFFL_t(|ob8>BdYe29g~2i5Cn@PiyZgV@ zPqInYEtW)L2!Wlq3(qzg%f~+fTND=s00000{t3#mydC#Q=?=~po{oY-s{+VURh3pj zQ|eAmlj+}A$K$aYkID0m3LyKzdw&osDCUsN`&J08elz_CX~%d-6~d|jUy-SbhqQ>= zN24gw$2@#3mM_PD6HfLalSasYtbmjUvR9+M61qUm2C08seQ-W0fiw7bbx1@N=u!@j zKPupua1ia4WFH06=a_7ukl+{+Bn7%Z{NI<*{oy~QAQT{EkgPx!eyxCn0?U3AD5<|? zA_y#+9}SS`VWxc)SP24a`rqFbP~WBT)GKNq&Zi;dlYN8=;O!Rl!Wh&WAm)GdpQgQK z(B2ze<9<{C|LZY(C_vei!G}smqJ>CD&K@_Z69IGsPj zk7$pH&L4uk;L5!voZo+OAv!)t_Lk~^KBB#&%At>Jr*Y8BcFv&ZG(v)0|0cH6`1!(^D1lj&ADD(Exk`vKRwM$-P2XwYr|8|0W{|4mXLY1sI(Cyp?y;%Qtf_(o5 z5V&=L7akup2;^@u-JUxJ^ZgspRj4dVbv~=whY3G?-E83M)C#K1Z-xcFjwH4NlZ9A`6^0JuZor-QwX4{Y~O(B&^&;+Jt?=CQ0my7pZaF5|$?V^M)F$fGI5Ztq^k z2Hfr4OKiZsHs9EQyKTN=y#L&Y+8CSIIi45zJq*?m+%_bRddYtE72HX7Ee`+y0001h zy;6H$i!Xy2?dn^_-W<<6)`;6l#JBw@@B4XsJgF<4v13T3yp!t9A$>K!?M8l^&52)l zQ*Tz`{Z2Z0>E4g2<=(130Nw&m?067)A2z2`Z&$KeFMb#08MiChtQWt#$~!9Cf6c&Z z@w;&gMZ%SfUaMD%-`(_8{2JkHe$Qx~gSVcG!;d#&t%o=S)AGNyyLsFp@zEW z%?608lA?kGZ)m?|g<}L!?xG<8ciOVRux4N;dqr860dr~q000000N#=Z9^gq$s;y^r zr#{QO*fYP%Qo!FNpUd?}K4|&RUXJOo^XU(whV6>)n%ndKn@S!&?$0@)EP6iAU@ZmQ zB~K-ek0B`Q3Dq=#RzA-#aVg+;`sBpAP7D8GpVmpOe4b&Zr2s3N$z2316951J00000 z00000006em)Yw!^Y^;mF;cxo$ld#iMYq2SB*w-P3zow?v0)dYO3SY)!@h0t=;Ku@m vuj7$;(@{zKXrS;d(Ia?>%mDxZ*bx5%%S21|GU4n+00000NkvXXu0mjfz{Q;D