From fc662a146335c211290507b135d408eee4d69ca5 Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Thu, 21 Dec 2023 09:55:09 +0300 Subject: [PATCH] PR of the day, a day late | I HATE THE ANTICHRIST!! | Upgrades the SolFed response outfits (except the engineering one) (#25490) (#1221) * everything * puts the right item paths there * fixes the gas masks * fixes outfit sanity * Adds trailing commas to multi-line lists. --------- Co-authored-by: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com> Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> --- .../code/armament_datums/sol_defense.dm | 20 +++-- .../modules/goofsec/code/sol_fed.dm | 84 ++++++++++-------- .../modules/goofsec/code/solfed_clothing.dm | 42 +++++++++ .../modules/goofsec/icons/uniforms.dmi | Bin 0 -> 1212 bytes .../modules/goofsec/icons/uniforms_worn.dmi | Bin 0 -> 3403 bytes .../goofsec/icons/uniforms_worn_digi.dmi | Bin 0 -> 2647 bytes tgstation.dme | 1 + 7 files changed, 106 insertions(+), 41 deletions(-) create mode 100644 modular_skyrat/modules/goofsec/code/solfed_clothing.dm create mode 100644 modular_skyrat/modules/goofsec/icons/uniforms.dmi create mode 100644 modular_skyrat/modules/goofsec/icons/uniforms_worn.dmi create mode 100644 modular_skyrat/modules/goofsec/icons/uniforms_worn_digi.dmi diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/sol_defense.dm b/modular_skyrat/modules/company_imports/code/armament_datums/sol_defense.dm index c30fbbc69d8..7ebffe34c42 100644 --- a/modular_skyrat/modules/company_imports/code/armament_datums/sol_defense.dm +++ b/modular_skyrat/modules/company_imports/code/armament_datums/sol_defense.dm @@ -2,6 +2,18 @@ category = SOL_DEFENSE_DEFENSE_NAME company_bitflag = CARGO_COMPANY_SOL_DEFENSE +// Beautiful SolFed clothing + +/datum/armament_entry/company_import/sol_defense/clothing + subcategory = "Surplus Clothing" + cost = PAYCHECK_CREW + +/datum/armament_entry/company_import/sol_defense/clothing/peacekeeper + item_type = /obj/item/clothing/under/sol_peacekeeper + +/datum/armament_entry/company_import/sol_defense/clothing/emt + item_type = /obj/item/clothing/under/sol_emt + // Armor vests for protecting against bullets /datum/armament_entry/company_import/sol_defense/armor @@ -20,12 +32,11 @@ /datum/armament_entry/company_import/sol_defense/armor/sf_soft_vest item_type = /obj/item/clothing/suit/armor/sf_peacekeeper -/datum/armament_entry/company_import/sol_defense/armor/normal_vest - name = "type I vest - normal" - item_type = /obj/item/clothing/suit/armor/vest/alt +/datum/armament_entry/company_import/sol_defense/armor/flak_jacket + item_type = /obj/item/clothing/suit/armor/vest/det_suit/sol /datum/armament_entry/company_import/sol_defense/armor/slim_vest - name = "type I vest - slim" + name = "type I vest" item_type = /obj/item/clothing/suit/armor/vest /datum/armament_entry/company_import/sol_defense/armor_hardened @@ -35,7 +46,6 @@ /datum/armament_entry/company_import/sol_defense/armor_hardened/enclosed_helmet item_type = /obj/item/clothing/head/helmet/toggleable/sf_hardened - /datum/armament_entry/company_import/sol_defense/armor_hardened/emt_enclosed_helmet item_type = /obj/item/clothing/head/helmet/toggleable/sf_hardened/emt diff --git a/modular_skyrat/modules/goofsec/code/sol_fed.dm b/modular_skyrat/modules/goofsec/code/sol_fed.dm index 2e8348b8eba..2f6e9064c50 100644 --- a/modular_skyrat/modules/goofsec/code/sol_fed.dm +++ b/modular_skyrat/modules/goofsec/code/sol_fed.dm @@ -321,21 +321,24 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( /datum/outfit/request_911/police name = "911 Response: Marshal" - back = /obj/item/storage/backpack/duffelbag/cops - uniform = /obj/item/clothing/under/rank/security/detective/cowboy - shoes = /obj/item/clothing/shoes/cowboy + back = /obj/item/storage/backpack/satchel + uniform = /obj/item/clothing/under/sol_peacekeeper + suit = /obj/item/clothing/suit/armor/vest/det_suit/sol + shoes = /obj/item/clothing/shoes/jackboots glasses = /obj/item/clothing/glasses/sunglasses ears = /obj/item/radio/headset/headset_sec/alt - head = /obj/item/clothing/head/cowboy - belt = /obj/item/gun/energy/disabler - r_pocket = /obj/item/lighter + head = /obj/item/clothing/head/soft/black + suit_store = /obj/item/gun/energy/disabler + belt = /obj/item/melee/baton/security/loaded + r_pocket = /obj/item/flashlight/seclite l_pocket = /obj/item/restraints/handcuffs id = /obj/item/card/id/advanced/solfed - backpack_contents = list(/obj/item/storage/box/survival = 1, + backpack_contents = list( + /obj/item/storage/box/survival = 1, /obj/item/storage/box/handcuffs = 1, - /obj/item/melee/baton/security/loaded = 1, /obj/item/solfed_reporter/swat_caller = 1, - /obj/item/beamout_tool = 1) + /obj/item/beamout_tool = 1, + ) id_trim = /datum/id_trim/solfed @@ -366,7 +369,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( /obj/item/rwd/loaded = 1, /obj/item/beamout_tool = 1, /obj/item/solfed_reporter/swat_caller = 1, - ) + ) id_trim = /datum/id_trim/solfed/atmos /obj/item/radio/headset/headset_solfed/atmos @@ -396,21 +399,25 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( /datum/outfit/request_911/emt name = "911 Response: EMT" - back = /obj/item/storage/backpack/duffelbag/cops - uniform = /obj/item/clothing/under/rank/medical/paramedic - shoes = /obj/item/clothing/shoes/sneakers/white + back = /obj/item/storage/backpack/medic + uniform = /obj/item/clothing/under/sol_emt + shoes = /obj/item/clothing/shoes/jackboots ears = /obj/item/radio/headset/headset_med - head = /obj/item/clothing/head/soft/paramedic + mask = /obj/item/clothing/mask/gas/alt + head = /obj/item/clothing/head/helmet/toggleable/sf_hardened/emt id = /obj/item/card/id/advanced/solfed - suit = /obj/item/clothing/suit/toggle/labcoat/paramedic + suit = /obj/item/clothing/suit/armor/sf_hardened/emt gloves = /obj/item/clothing/gloves/latex/nitrile - belt = /obj/item/storage/belt/medical/paramedic - suit_store = /obj/item/flashlight/pen/paramedic - backpack_contents = list(/obj/item/storage/box/survival = 1, + belt = /obj/item/storage/backpack/duffelbag/deforest_medkit/stocked + suit_store = /obj/item/tank/internals/emergency_oxygen/engi + r_pocket = /obj/item/flashlight/seclite + l_pocket = /obj/item/storage/medkit/civil_defense + backpack_contents = list( + /obj/item/storage/box/survival = 1, /obj/item/emergency_bed = 1, - /obj/item/storage/medkit/surgery = 1, /obj/item/solfed_reporter/swat_caller = 1, - /obj/item/beamout_tool = 1) + /obj/item/beamout_tool = 1, + ) id_trim = /datum/id_trim/solfed @@ -438,24 +445,26 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( /datum/outfit/request_911/condom_destroyer name = "911 Response: Armed S.W.A.T. Officer" - back = /obj/item/storage/backpack/duffelbag/cops - uniform = /obj/item/clothing/under/rank/security/officer/beatcop + back = /obj/item/storage/backpack + uniform = /obj/item/clothing/under/sol_peacekeeper shoes = /obj/item/clothing/shoes/jackboots glasses = /obj/item/clothing/glasses/sunglasses ears = /obj/item/radio/headset/headset_sec/alt - head = /obj/item/clothing/head/helmet/toggleable/riot + head = /obj/item/clothing/head/helmet/sf_peacekeeper belt = /obj/item/gun/energy/disabler - suit = /obj/item/clothing/suit/armor/riot - r_pocket = /obj/item/lighter + suit = /obj/item/clothing/suit/armor/sf_peacekeeper + r_pocket = /obj/item/flashlight/seclite l_pocket = /obj/item/restraints/handcuffs id = /obj/item/card/id/advanced/solfed - l_hand = /obj/item/gun/ballistic/shotgun/riot - backpack_contents = list(/obj/item/storage/box/survival = 1, + l_hand = /obj/item/gun/ballistic/shotgun/riot/sol + backpack_contents = list( + /obj/item/storage/box/survival = 1, /obj/item/storage/box/handcuffs = 1, /obj/item/melee/baton/security/loaded = 1, /obj/item/storage/box/lethalshot = 2, /obj/item/solfed_reporter/treason_reporter = 1, - /obj/item/beamout_tool = 1) + /obj/item/beamout_tool = 1, + ) id_trim = /datum/id_trim/solfed @@ -482,22 +491,25 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( /datum/outfit/request_911/treason_destroyer name = "911 Response: SolFed Military" - uniform = /obj/item/clothing/under/rank/security/officer/hecu - head = /obj/item/clothing/head/helmet - mask = /obj/item/clothing/mask/gas/hecu2 + uniform = /obj/item/clothing/under/sol_peacekeeper + head = /obj/item/clothing/head/helmet/sf_sacrificial + mask = /obj/item/clothing/mask/gas/alt gloves = /obj/item/clothing/gloves/combat - suit = /obj/item/clothing/suit/armor/vest - shoes = /obj/item/clothing/shoes/combat + suit = /obj/item/clothing/suit/armor/sf_sacrificial + shoes = /obj/item/clothing/shoes/jackboots - back = /obj/item/storage/backpack/duffelbag/cops + back = /obj/item/storage/backpack glasses = /obj/item/clothing/glasses/sunglasses ears = /obj/item/radio/headset/headset_sec/alt l_pocket = /obj/item/restraints/handcuffs + r_pocket = /obj/item/flashlight/seclite id = /obj/item/card/id/advanced/solfed r_hand = /obj/item/gun/ballistic/automatic/sol_rifle - backpack_contents = list(/obj/item/storage/box/handcuffs = 1, + backpack_contents = list( + /obj/item/storage/box/handcuffs = 1, + /obj/item/sacrificial_face_shield = 1, /obj/item/melee/baton/security/loaded = 1, - /obj/item/ammo_box/magazine/c40sol_rifle/standard = 4 + /obj/item/ammo_box/magazine/c40sol_rifle/standard = 4, ) id_trim = /datum/id_trim/solfed diff --git a/modular_skyrat/modules/goofsec/code/solfed_clothing.dm b/modular_skyrat/modules/goofsec/code/solfed_clothing.dm new file mode 100644 index 00000000000..ab3bff3e7d2 --- /dev/null +++ b/modular_skyrat/modules/goofsec/code/solfed_clothing.dm @@ -0,0 +1,42 @@ +// Peacekeeper jumpsuit + +/obj/item/clothing/under/sol_peacekeeper + name = "sol peacekeeper uniform" + desc = "A military-grade uniform with military grade comfort (none at all), often seen on \ + SolFed's various peacekeeping forces, and usually alongside a blue helmet." + icon = 'modular_skyrat/modules/goofsec/icons/uniforms.dmi' + icon_state = "peacekeeper" + worn_icon = 'modular_skyrat/modules/goofsec/icons/uniforms_worn.dmi' + worn_icon_digi = 'modular_skyrat/modules/goofsec/icons/uniforms_worn_digi.dmi' + worn_icon_state = "peacekeeper" + armor_type = /datum/armor/clothing_under/rank_security + inhand_icon_state = null + has_sensor = SENSOR_COORDS + random_sensor = FALSE + +// EMT jumpsuit + +/obj/item/clothing/under/sol_emt + name = "sol emergency medical uniform" + desc = "A copy of SolFed's peacekeeping uniform, recolored and re-built paramedics in mind." + icon = 'modular_skyrat/modules/goofsec/icons/uniforms.dmi' + icon_state = "emt" + worn_icon = 'modular_skyrat/modules/goofsec/icons/uniforms_worn.dmi' + worn_icon_digi = 'modular_skyrat/modules/goofsec/icons/uniforms_worn_digi.dmi' + worn_icon_state = "emt" + armor_type = /datum/armor/clothing_under/rank_medical + inhand_icon_state = null + has_sensor = SENSOR_COORDS + random_sensor = FALSE + +// Solfed flak jacket, for marshals + +/obj/item/clothing/suit/armor/vest/det_suit/sol + name = "'Gordyn' flak vest" + desc = "A light armored jacket common on SolFed personnel who need armor, but find a full vest \ + too impractical or uneeded." + icon = 'modular_skyrat/modules/goofsec/icons/uniforms.dmi' + icon_state = "flak" + worn_icon = 'modular_skyrat/modules/goofsec/icons/uniforms_worn.dmi' + worn_icon_state = "flak" + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON diff --git a/modular_skyrat/modules/goofsec/icons/uniforms.dmi b/modular_skyrat/modules/goofsec/icons/uniforms.dmi new file mode 100644 index 0000000000000000000000000000000000000000..82b6c313b73325036f28217b0d24d3d595ae023a GIT binary patch literal 1212 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 J|ET8@^FJ>4w(tM| literal 0 HcmV?d00001 diff --git a/modular_skyrat/modules/goofsec/icons/uniforms_worn_digi.dmi b/modular_skyrat/modules/goofsec/icons/uniforms_worn_digi.dmi new file mode 100644 index 0000000000000000000000000000000000000000..934a079713ae3675671ffb07d562405355746e06 GIT binary patch literal 2647 zcmbu>X*?9_9tZFl8iX-A30cCyAcP!aDKoY#A!Q0>$&#{W8GDA2oRTA*B4G*I+xM>$;ZT+TC#j*Pt#L`CO0vo{K0#f! zqChw|B|*JdUQP219)>T3!Q--42@}7#5@uj#w_8X0L2C+tOM-BkO2DHo0N`YbnUVg@ zFzk#`c&9l@o*yrj(TTbc2vQq!2K>mH;MkcT5dc;{O;63u(7etL9%F4 zfNm;$to(p6HPuL;9M`x@?b7^Q_YX?-%87x;&`O|BjAg0v-t9y&XV*Coze(j!hjHL7 zbBW_gv?^*eUu)641>IePcvY#odHHf^$lezs(6nw#m>3|jW{I=9-a@8ok7M{SB5_YM)8L4W%ewqH5DgvBRUjI^@BgZ;1;uJ9 z)Mvw4G7l$Z^a$uePP9F5Syr`bT)|HYd9~lrXHEkTz+vB*_JtP zjyPDyh0~php`GIE%`}|Qq{(YePIxqb!LbTD`Y93N@0_`D-ylDS(Z$>+X~tECMjnxQ zMr&Gd%K&<&)&d-R5R2%41At*KG4-u``C&{Cpq`BpnsbI!xwZ3n z$8hE*%$;#tG{8Yi?|hxLfhDy+jc0wrLBz0_T{0&OxVfh}b-4+@hsY{2>qK7}dc@dI zqJuP)ZXE{a5+E^dt>=7Zh$_cz`N7}+Ouq>JjovTB2f2RRSPlYB>u+Oeu(Xfd|Qb7!sdV_WHlNX%ys^O}H zno696Yj;+n8fJtiUO9GLFpHOqcf8*$<(mDW`{tEO7elW^56-MpPv7ehSu#;Z0?UB0;tK4evH&izNSlDwgA?~{ucS`+`*#2TjR);V7jk43}6;wZb)_9{fA|hSHL$BM* zKEu^>4Y15qWfq;k*Vm6K{(ZJ?*1WTFcy&IaZ$xXSn6U6A6Gfevhj_DBW}WmUwJ1pW zBvfUWu|JstNo#EuHmIB_TEWyuuB^q5{kp&b>W!28!X=gioog_C=@M zn<$P+Tf8X4Eh6od>%i^!Oe%IJVUbhnQ$IxCoi9y9=hxJz?06wp+r>aOu!sI>`sf=M zEFyy6uA196d|7bM|QjS3RmFZr8YwzTLboj3mKWBoM22UB(-aR9cmB=L?yaf!T*gC3j0m~UY zv$TGPW$<$dKaztL@pJ6*aLlxAB%p)y`o9A64V7@}@0ArXMQ;lzAi;|Iff}9XkgR=x z?bs0XIYjc`Ed9ORGpNyVl+VbXa-+BH)H1woQ!X@$nkXCFmw&&V7IKgzM*Q5=d;DYK z(ed_P*s7dKIrBo&0qCpx9(kZDOR2!}((elNP6XH3QI8cm?*_>E3>h(p#%?nsF)Z-Hb*td|!0ou<66yl zcazY5#mJ@|95GtMFSA84RX3c}xJg_A(GqMjEghGG2ur)khk{xo;7mqR!~SRQ2^6Ji zK*gu}M5z?b4%6FQ%>R|f{(!OOL7p0;4INFlE?cFx4RfoJmrni7$_!&D$Eu!sp8}BQ>0w9G}J4MD)m0* zr(6$$Er)zR5jj@c@q*L!86#ESCd&&UcT2~2B~{I57V=XMM16FUJ-t|Q3wRC@C6Bui zOuF(Gx`af2Ec4!h*X*`7K0IFdR&@B;LM-GN#D4+LWApt{pyL#Or> z9&nVQ2JH4uZMtm^Z9f)G1c2 z_MskAKR#;ABv&3(Xca-{AjS8N92U zj(jak#?YP?%o6n!5+UJs-Yi+c`HYyXEiGXfHlm9qI!DY}2L dBmABT>Bml^8fb{wJ=lE$sjR literal 0 HcmV?d00001 diff --git a/tgstation.dme b/tgstation.dme index da61a1b99ce..85b74c60822 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7213,6 +7213,7 @@ #include "modular_skyrat\modules\goofsec\code\hud.dm" #include "modular_skyrat\modules\goofsec\code\sec_clothing_overrides.dm" #include "modular_skyrat\modules\goofsec\code\sol_fed.dm" +#include "modular_skyrat\modules\goofsec\code\solfed_clothing.dm" #include "modular_skyrat\modules\gun_safety\code\keybinding.dm" #include "modular_skyrat\modules\gun_safety\code\safety_additions.dm" #include "modular_skyrat\modules\gun_safety\code\safety_component.dm"