From ffbcf2f7ea29bae350a4e2188bd12de554f333e8 Mon Sep 17 00:00:00 2001 From: QuickLode <63271983+QuickLode@users.noreply.github.com> Date: Fri, 7 Jun 2024 00:17:22 -0700 Subject: [PATCH 1/5] smelly hippie suitjacket --- .../crates_lockers/closets/job_closets.dm | 2 +- code/modules/clothing/suits/jobs.dm | 54 +++++++++++++------ code/modules/clothing/under/marine_uniform.dm | 4 +- code/modules/gear_presets/survivors/misc.dm | 2 +- code/modules/gear_presets/synths.dm | 2 +- maps/map_files/BigRed/BigRed.dmm | 2 +- 6 files changed, 44 insertions(+), 22 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 94b246e79a99..b3efaff4d959 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -69,7 +69,7 @@ new /obj/item/clothing/under/lawyer/black(src) new /obj/item/clothing/under/lawyer/red(src) new /obj/item/clothing/under/lawyer/bluesuit(src) - new /obj/item/clothing/suit/storage/lawyer/bluejacket(src) + new /obj/item/clothing/suit/storage/lawyer(src) new /obj/item/clothing/under/lawyer/purpsuit(src) new /obj/item/clothing/suit/storage/lawyer/purpjacket(src) new /obj/item/clothing/shoes/brown(src) diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 5b97051852a6..03694efc31b6 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -21,7 +21,6 @@ /obj/item/device/radio, /obj/item/tank/emergency_oxygen, /obj/item/tool/crowbar, - /obj/item/tool/pen, ) //Captain /obj/item/clothing/suit/captunic @@ -55,7 +54,6 @@ /obj/item/weapon/gun/, /obj/item/tank/emergency_oxygen, /obj/item/device/flashlight, - /obj/item/storage/fancy/cigarettes, /obj/item/tool/lighter, /obj/item/storage/bible, /obj/item/attachable/bayonet, @@ -111,7 +109,6 @@ /obj/item/device/radio, /obj/item/tank/emergency_oxygen, /obj/item/tool/crowbar, - /obj/item/tool/pen, ) //Chef @@ -131,7 +128,6 @@ /obj/item/device/radio, /obj/item/tank/emergency_oxygen, /obj/item/tool/crowbar, - /obj/item/tool/pen, ) //Security @@ -182,7 +178,6 @@ /obj/item/ammo_casing, /obj/item/weapon/baton, /obj/item/handcuffs, - /obj/item/storage/fancy/cigarettes, /obj/item/tool/lighter, /obj/item/weapon/baton, /obj/item/handcuffs, @@ -200,7 +195,6 @@ /obj/item/tank/emergency_oxygen, /obj/item/tool/crowbar, /obj/item/tool/crew_monitor, - /obj/item/tool/pen, /obj/item/storage/large_holster/machete, /obj/item/storage/large_holster/katana, /obj/item/device/motiondetector, @@ -239,7 +233,6 @@ /obj/item/clothing/mask/gas, /obj/item/weapon/gun, - /obj/item/storage/fancy/cigarettes, /obj/item/tool/lighter, /obj/item/weapon/baton, /obj/item/ammo_magazine, @@ -260,7 +253,6 @@ /obj/item/tank/emergency_oxygen, /obj/item/tool/crowbar, /obj/item/tool/crew_monitor, - /obj/item/tool/pen, /obj/item/storage/large_holster/machete, /obj/item/storage/large_holster/katana, /obj/item/device/motiondetector, @@ -307,7 +299,6 @@ /obj/item/clothing/mask/gas, /obj/item/weapon/gun, - /obj/item/storage/fancy/cigarettes, /obj/item/tool/lighter, /obj/item/weapon/baton, /obj/item/handcuffs, @@ -324,7 +315,6 @@ /obj/item/tank/emergency_oxygen, /obj/item/tool/crowbar, /obj/item/tool/crew_monitor, - /obj/item/tool/pen, /obj/item/storage/large_holster/machete, /obj/item/storage/large_holster/katana, /obj/item/device/motiondetector, @@ -351,18 +341,52 @@ item_state = "hazard_black" //Lawyer -/obj/item/clothing/suit/storage/lawyer/bluejacket - name = "Blue Suit Jacket" +/obj/item/clothing/suit/storage/lawyer + name = "blue suit jacket" desc = "A snappy dress jacket." icon_state = "suitjacket_blue_open" item_state = "suitjacket_blue_open" blood_overlay_type = "coat" + allowed = list ( + /obj/item/device/analyzer, + /obj/item/device/multitool, + /obj/item/device/pipe_painter, + /obj/item/device/radio, + /obj/item/device/t_scanner, + /obj/item/tool/crowbar, + /obj/item/tool/screwdriver, + /obj/item/tool/weldingtool, + /obj/item/tool/wirecutters, + /obj/item/tool/wrench, + /obj/item/clothing/mask/gas, + + /obj/item/weapon/gun, + /obj/item/tool/lighter, + /obj/item/weapon/baton, + /obj/item/handcuffs, + /obj/item/device/binoculars, + /obj/item/attachable/bayonet, + /obj/item/storage/belt/gun/m4a3, + /obj/item/storage/belt/gun/m44, + /obj/item/storage/belt/gun/mateba, + /obj/item/storage/belt/gun/smartpistol, + + /obj/item/device/flashlight, + /obj/item/device/healthanalyzer, + /obj/item/device/radio, + /obj/item/tank/emergency_oxygen, + /obj/item/tool/crowbar, + /obj/item/tool/crew_monitor, + /obj/item/storage/large_holster/machete, + /obj/item/storage/large_holster/katana, + /obj/item/device/motiondetector, + ) flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL) restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND) /obj/item/clothing/suit/storage/lawyer/purpjacket - name = "Purple Suit Jacket" + name = "purple suit jacket" desc = "A snappy dress jacket." icon_state = "suitjacket_purp" item_state = "suitjacket_purp" @@ -371,7 +395,7 @@ //Internal Affairs /obj/item/clothing/suit/storage/internalaffairs - name = "Internal Affairs Jacket" + name = "internal affairs jacket" desc = "A smooth black jacket." icon_state = "ia_jacket_open" item_state = "ia_jacket" @@ -406,7 +430,6 @@ desc = "This shouldn't be here..." blood_overlay_type = "armor" allowed = list( - /obj/item/storage/fancy/cigarettes, /obj/item/tool/lighter, /obj/item/weapon/baton, /obj/item/handcuffs, @@ -425,7 +448,6 @@ /obj/item/tank/emergency_oxygen, /obj/item/tool/crowbar, /obj/item/tool/crew_monitor, - /obj/item/tool/pen, /obj/item/storage/large_holster/machete, /obj/item/storage/large_holster/katana, /obj/item/device/motiondetector, diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index 4f0c06273d9e..5b069c651f7e 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -888,7 +888,7 @@ item_icons = list( WEAR_BODY = 'icons/mob/humans/onmob/uniform_1.dmi', ) - + /obj/item/clothing/under/marine/reporter/black icon_state = "cc_black" worn_state = "cc_black" @@ -998,7 +998,7 @@ worn_state = "working_joe_engi" flags_inventory = CANTSTRIP armor_melee = CLOTHING_ARMOR_LOW - armor_energy = CLOTHING_ARMOR_MEDIUMLOW + armor_energy = CLOTHING_ARMOR_HIGH armor_bomb = CLOTHING_ARMOR_MEDIUMLOW armor_bio = CLOTHING_ARMOR_MEDIUM armor_rad = CLOTHING_ARMOR_HIGH diff --git a/code/modules/gear_presets/survivors/misc.dm b/code/modules/gear_presets/survivors/misc.dm index 7a845e96b2aa..6e9a246dabbb 100644 --- a/code/modules/gear_presets/survivors/misc.dm +++ b/code/modules/gear_presets/survivors/misc.dm @@ -79,7 +79,7 @@ Everything below isn't used or out of place. if(2) // Bar Tender new_human.equip_to_slot_or_del(new /obj/item/clothing/under/waiter(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/lawyer/bluejacket(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/lawyer(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/bowlerhat(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/fake_mustache(new_human), WEAR_FACE) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/black(new_human), WEAR_HANDS) diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index e27d33315e73..75a6167b999a 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -344,7 +344,7 @@ WEAR_IN_BACK = /obj/item/reagent_container/food/drinks/bottle/cognac, WEAR_IN_BACK = /obj/item/reagent_container/food/drinks/bottle/grenadine, WEAR_IN_BACK = /obj/item/reagent_container/food/drinks/bottle/rum, - WEAR_JACKET = /obj/item/clothing/suit/storage/lawyer/bluejacket, + WEAR_JACKET = /obj/item/clothing/suit/storage/lawyer, WEAR_HANDS = /obj/item/clothing/gloves/marine/black, WEAR_R_HAND = /obj/item/storage/beer_pack, WEAR_R_STORE = /obj/item/storage/pouch/tools/full, diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index b605e7115c10..5567d79531a1 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -4788,7 +4788,7 @@ /area/bigredv2/outside/marshal_office) "aom" = ( /obj/structure/surface/table/woodentable/fancy, -/obj/item/clothing/suit/storage/lawyer/bluejacket, +/obj/item/clothing/suit/storage/lawyer, /turf/open/floor{ icon_state = "wood" }, From a47a406b5be10898d57b9047bfbac6cc2223363e Mon Sep 17 00:00:00 2001 From: QuickLode <63271983+QuickLode@users.noreply.github.com> Date: Fri, 7 Jun 2024 01:03:04 -0700 Subject: [PATCH 2/5] Update marine_uniform.dm --- code/modules/clothing/under/marine_uniform.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index 5b069c651f7e..d5996a1b6ad2 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -888,7 +888,6 @@ item_icons = list( WEAR_BODY = 'icons/mob/humans/onmob/uniform_1.dmi', ) - /obj/item/clothing/under/marine/reporter/black icon_state = "cc_black" worn_state = "cc_black" @@ -998,7 +997,7 @@ worn_state = "working_joe_engi" flags_inventory = CANTSTRIP armor_melee = CLOTHING_ARMOR_LOW - armor_energy = CLOTHING_ARMOR_HIGH + armor_energy = CLOTHING_ARMOR_MEDIUMLOW armor_bomb = CLOTHING_ARMOR_MEDIUMLOW armor_bio = CLOTHING_ARMOR_MEDIUM armor_rad = CLOTHING_ARMOR_HIGH From 668df1474908f117bdae941269bf8633ea4f9f82 Mon Sep 17 00:00:00 2001 From: QuickLode <63271983+QuickLode@users.noreply.github.com> Date: Fri, 7 Jun 2024 01:10:00 -0700 Subject: [PATCH 3/5] spac --- code/modules/clothing/under/marine_uniform.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index d5996a1b6ad2..97e882d97f11 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -888,6 +888,7 @@ item_icons = list( WEAR_BODY = 'icons/mob/humans/onmob/uniform_1.dmi', ) + /obj/item/clothing/under/marine/reporter/black icon_state = "cc_black" worn_state = "cc_black" From 567d3caac1b98e5350436c03de4d1d849166b253 Mon Sep 17 00:00:00 2001 From: QuickLode <63271983+QuickLode@users.noreply.github.com> Date: Fri, 7 Jun 2024 04:48:48 -0700 Subject: [PATCH 4/5] typo --- code/modules/clothing/suits/jobs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 03694efc31b6..1a19b60e2a2e 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -363,7 +363,7 @@ /obj/item/weapon/gun, /obj/item/tool/lighter, /obj/item/weapon/baton, - /obj/item/handcuffs, + /obj/item/restraint/handcuffs, /obj/item/device/binoculars, /obj/item/attachable/bayonet, /obj/item/storage/belt/gun/m4a3, From 17605165445c3013acab33f16db472c5b6d5bb5d Mon Sep 17 00:00:00 2001 From: QuickLode <63271983+QuickLode@users.noreply.github.com> Date: Wed, 19 Jun 2024 07:10:52 -0700 Subject: [PATCH 5/5] removes duplicates, removes O2, pipe painter and t scanner which are not used --- code/modules/clothing/suits/jobs.dm | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 2209304e9338..df93ddb6f9c7 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -163,9 +163,7 @@ allowed = list( /obj/item/device/analyzer, /obj/item/device/multitool, - /obj/item/device/pipe_painter, /obj/item/device/radio, - /obj/item/device/t_scanner, /obj/item/tool/crowbar, /obj/item/tool/screwdriver, /obj/item/tool/weldingtool, @@ -175,7 +173,6 @@ /obj/item/weapon/gun, /obj/item/ammo_magazine, - /obj/item/ammo_casing, /obj/item/weapon/baton, /obj/item/restraint/handcuffs, /obj/item/tool/lighter, @@ -191,9 +188,6 @@ /obj/item/device/flashlight, /obj/item/device/healthanalyzer, /obj/item/device/taperecorder, - /obj/item/device/radio, - /obj/item/tank/emergency_oxygen, - /obj/item/tool/crowbar, /obj/item/tool/crew_monitor, /obj/item/storage/large_holster/machete, /obj/item/storage/large_holster/katana, @@ -222,9 +216,7 @@ allowed = list( /obj/item/device/analyzer, /obj/item/device/multitool, - /obj/item/device/pipe_painter, /obj/item/device/radio, - /obj/item/device/t_scanner, /obj/item/tool/crowbar, /obj/item/tool/screwdriver, /obj/item/tool/weldingtool, @@ -236,7 +228,6 @@ /obj/item/tool/lighter, /obj/item/weapon/baton, /obj/item/ammo_magazine, - /obj/item/ammo_casing, /obj/item/weapon/baton, /obj/item/restraint/handcuffs, /obj/item/device/binoculars, @@ -249,9 +240,6 @@ /obj/item/device/flashlight, /obj/item/device/healthanalyzer, /obj/item/device/taperecorder, - /obj/item/device/radio, - /obj/item/tank/emergency_oxygen, - /obj/item/tool/crowbar, /obj/item/tool/crew_monitor, /obj/item/storage/large_holster/machete, /obj/item/storage/large_holster/katana, @@ -288,9 +276,7 @@ allowed = list ( /obj/item/device/analyzer, /obj/item/device/multitool, - /obj/item/device/pipe_painter, /obj/item/device/radio, - /obj/item/device/t_scanner, /obj/item/tool/crowbar, /obj/item/tool/screwdriver, /obj/item/tool/weldingtool, @@ -311,9 +297,6 @@ /obj/item/device/flashlight, /obj/item/device/healthanalyzer, - /obj/item/device/radio, - /obj/item/tank/emergency_oxygen, - /obj/item/tool/crowbar, /obj/item/tool/crew_monitor, /obj/item/storage/large_holster/machete, /obj/item/storage/large_holster/katana, @@ -350,9 +333,7 @@ allowed = list ( /obj/item/device/analyzer, /obj/item/device/multitool, - /obj/item/device/pipe_painter, /obj/item/device/radio, - /obj/item/device/t_scanner, /obj/item/tool/crowbar, /obj/item/tool/screwdriver, /obj/item/tool/weldingtool, @@ -373,9 +354,6 @@ /obj/item/device/flashlight, /obj/item/device/healthanalyzer, - /obj/item/device/radio, - /obj/item/tank/emergency_oxygen, - /obj/item/tool/crowbar, /obj/item/tool/crew_monitor, /obj/item/storage/large_holster/machete, /obj/item/storage/large_holster/katana,