Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tiny suit jacket suit storage fix #6393

Closed
wants to merge 7 commits into from
Closed

tiny suit jacket suit storage fix #6393

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ffbcf2f
smelly hippie suitjacket
QuickLode Jun 7, 2024
a47a406
Update marine_uniform.dm
QuickLode Jun 7, 2024
668df14
spac
QuickLode Jun 7, 2024
e905723
Merge branch 'master' into suit-jacket-hippie
QuickLode Jun 7, 2024
567d3ca
typo
QuickLode Jun 7, 2024
e71eff1
Merge branch 'suit-jacket-hippie' of https://github.com/QuickLode/cms…
QuickLode Jun 7, 2024
1760516
removes duplicates, removes O2, pipe painter and t scanner which are …
QuickLode Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/objects/structures/crates_lockers/closets/job_closets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
54 changes: 38 additions & 16 deletions code/modules/clothing/suits/jobs.dm
View file
Open in desktop
QuickLode marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -111,7 +109,6 @@
/obj/item/device/radio,
/obj/item/tank/emergency_oxygen,
/obj/item/tool/crowbar,
/obj/item/tool/pen,
)

//Chef
Expand All @@ -131,7 +128,6 @@
/obj/item/device/radio,
/obj/item/tank/emergency_oxygen,
/obj/item/tool/crowbar,
/obj/item/tool/pen,
)

//Security
Expand Down Expand Up @@ -182,7 +178,6 @@
/obj/item/ammo_casing,
/obj/item/weapon/baton,
/obj/item/restraint/handcuffs,
/obj/item/storage/fancy/cigarettes,
/obj/item/tool/lighter,
/obj/item/weapon/baton,
/obj/item/restraint/handcuffs,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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/restraint/handcuffs,
Expand All @@ -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,
Expand All @@ -351,18 +341,52 @@
item_state = "hazard_black"

//Lawyer
/obj/item/clothing/suit/storage/lawyer/bluejacket
QuickLode marked this conversation as resolved.
Show resolved Hide resolved
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/restraint/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,
Copy link
Contributor

@Drulikar Drulikar Jun 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a bunch of duplicates in this list. And why are we allowing all these things in a lawyer jacket? A whole machete holster? A whole crowbar? Entire gun belts?

Copy link
Contributor Author

@QuickLode QuickLode Jun 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll fix the duplicates wasn't very careful with my code

Machete holster is on a sling
crowbar I can remove (just let me know if u want it gone)
gun belts are belts (https://www.everydaymarksman.co/wp-content/uploads/2019/02/old-battle-belt-3.jpg), you clip them around your waist ingame. you can do it to any jacket in CM including the one given to Marines. if its bad then I can remove it from all of the code but I am pretty sure its intended in lore, in nature and in code

This was brought to me as a bug fix because other jackets CAN carry waist/belts/buckled things while this jacket in particular can't carry much at all
So all I did in this PR was bring it up to the standard of similar jackets being used in CM

)
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"
Expand All @@ -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"
Expand Down Expand Up @@ -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/restraint/handcuffs,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/survivors/misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,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/shoes/laceup(new_human), WEAR_FEET)
Expand Down
2 changes: 1 addition & 1 deletion maps/map_files/BigRed/BigRed.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
Loading