Merge pull request #5051 from paprka/rollingjsuit

Ports and improves jumpsuit rolling (casual adjusting) and noir detective set

code/game/jobs/job/security.dm

@@ -205,27 +205,29 @@ var/list/sec_departments = list("engineering", "supply", "medical", "science")
 		var/department = pick(sec_departments)
 		sec_departments -= department
 		var/destination = null
+		var/obj/item/clothing/under/U = new /obj/item/clothing/under/rank/security(H)
 		switch(department)
 			if("supply")
-				H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/cargo(H), slot_w_uniform)
 				default_headset = /obj/item/device/radio/headset/headset_sec/department/supply
 				dep_access = list(access_mailsorting, access_mining)
 				destination = /area/security/checkpoint/supply
+				U.attachTie(new /obj/item/clothing/tie/armband/cargo())
 			if("engineering")
-				H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/engine(H), slot_w_uniform)
 				default_headset = /obj/item/device/radio/headset/headset_sec/department/engi
 				dep_access = list(access_construction, access_engine)
 				destination = /area/security/checkpoint/engineering
+				U.attachTie(new /obj/item/clothing/tie/armband/engine())
 			if("medical")
-				H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/med(H), slot_w_uniform)
 				default_headset = /obj/item/device/radio/headset/headset_sec/department/med
 				dep_access = list(access_medical)
 				destination = /area/security/checkpoint/medical
+				U.attachTie(new /obj/item/clothing/tie/armband/medblue())
 			if("science")
-				H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/science(H), slot_w_uniform)
 				default_headset = /obj/item/device/radio/headset/headset_sec/department/sci
 				dep_access = list(access_research)
 				destination = /area/security/checkpoint/science
+				U.attachTie(new /obj/item/clothing/tie/armband/science())
+		H.equip_to_slot_or_del(U, slot_w_uniform)
 		var/teleport = 0
 		if(!config.sec_start_brig)
 			if(destination)
@@ -267,15 +269,3 @@ var/list/sec_departments = list("engineering", "supply", "medical", "science")
 /obj/item/device/radio/headset/headset_sec/department/sci
 	keyslot1 = new /obj/item/device/encryptionkey/headset_sec
 	keyslot2 = new /obj/item/device/encryptionkey/headset_sci
-
-/obj/item/clothing/under/rank/security/cargo/New()
-	attachTie(new /obj/item/clothing/tie/armband/cargo)
-
-/obj/item/clothing/under/rank/security/engine/New()
-	attachTie(new /obj/item/clothing/tie/armband/engine)
-
-/obj/item/clothing/under/rank/security/science/New()
-	attachTie(new /obj/item/clothing/tie/armband/science)
-
-/obj/item/clothing/under/rank/security/med/New()
-	attachTie(new /obj/item/clothing/tie/armband/medblue)

code/game/machinery/washing_machine.dm

@@ -131,6 +131,7 @@
 					J.item_color = wash_color
 					J.name = new_jumpsuit_name
 					J.desc = new_desc
+					J.suit_color = wash_color
 			if(new_glove_icon_state && new_glove_item_state && new_glove_name)
 				for(var/obj/item/clothing/gloves/G in contents)
 					//world << "DEBUG: YUP! FOUND IT!"

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -198,9 +198,12 @@
 	sleep(2)
 	new /obj/item/clothing/under/rank/det(src)
 	new /obj/item/clothing/suit/det_suit(src)
-	new /obj/item/clothing/gloves/black(src)
 	new /obj/item/clothing/head/det_hat(src)
-	new /obj/item/clothing/shoes/sneakers/brown(src)
+	new /obj/item/clothing/gloves/black(src)
+	new /obj/item/clothing/under/det/grey(src)
+	new /obj/item/clothing/suit/det_suit/grey(src)
+	new /obj/item/clothing/head/fedora(src)
+	new /obj/item/clothing/shoes/laceup(src)
 	new /obj/item/weapon/storage/box/evidence(src)
 	new /obj/item/weapon/clipboard(src)
 	new /obj/item/device/radio/headset/headset_sec(src)

code/modules/clothing/clothing.dm

@@ -160,6 +160,10 @@ BLIND     // can't see anything
 	var/fitted = 1// For use in alternate clothing styles for women, if clothes vary from a jumpsuit in shape, set this to 0
 	var/has_sensor = 1//For the crew computer 2 = unable to change mode
 	var/sensor_mode = 0
+	var/can_adjust = 1
+	var/adjusted = 0
+	var/suit_color = null
+
 		/*
 		1 = Report living/dead
 		2 = Report detailed damages
@@ -246,6 +250,27 @@ atom/proc/generate_uniform(index,t_color)
 			usr << "Your suit will now report your vital lifesigns as well as your coordinate position."
 	..()
 
+/obj/item/clothing/under/verb/rolldown()
+	set name = "Adjust Jumpsuit Style"
+	set category = "Object"
+	set src in usr
+	if(usr.stat)
+		return
+	if(!can_adjust)
+		usr << "You cannot wear this suit any differently."
+		return
+	if(src.adjusted == 1)
+		src.item_color = initial(item_color)
+		src.item_color = src.suit_color //colored jumpsuits are shit and break without this
+		usr << "You adjust the suit back to normal."
+		src.adjusted = 0
+	else
+		src.item_color += "_d"
+		usr << "You adjust the suit to wear it more casually."
+		src.adjusted = 1
+	usr.update_inv_w_uniform()
+	..()
+
 /obj/item/clothing/under/verb/removetie()
 	set name = "Remove Accessory"
 	set category = "Object"
@@ -266,8 +291,10 @@ atom/proc/generate_uniform(index,t_color)
 			var/mob/living/carbon/human/H = loc
 			H.update_inv_w_uniform(0)
 
-/obj/item/clothing/under/rank/New()
+/obj/item/clothing/under/New()
 	sensor_mode = pick(0,1,2,3)
+	adjusted = 0
+	suit_color = item_color
 	..()
 
 /obj/item/clothing/proc/weldingvisortoggle()			//Malk: proc to toggle welding visors on helmets, masks, goggles, etc.

code/modules/clothing/suits/jobs.dm

@@ -63,7 +63,7 @@
 
 //Detective
 /obj/item/clothing/suit/det_suit
-	name = "coat"
+	name = "trenchcoat"
 	desc = "An 18th-century multi-purpose trenchcoat. Someone who wears this means serious business."
 	icon_state = "detective"
 	item_state = "det_suit"
@@ -74,6 +74,12 @@
 	cold_protection = CHEST|GROIN|LEGS|ARMS
 	heat_protection = CHEST|GROIN|LEGS|ARMS
 
+/obj/item/clothing/suit/det_suit/grey
+	name = "noir trenchcoat"
+	desc = "A hard-boiled private investigator's grey trenchcoat."
+	icon_state = "greydet"
+	item_state = "greydet"
+
 //Engineering
 /obj/item/clothing/suit/hazardvest
 	name = "hazard vest"

code/modules/clothing/under/color.dm

@@ -11,6 +11,7 @@
 	item_state = "bl_suit"
 	item_color = "blackf"
 	fitted = 0
+	can_adjust = 0
 
 /obj/item/clothing/under/color/blue
 	name = "blue jumpsuit"

code/modules/clothing/under/jobs/civilian.dm

@@ -38,6 +38,7 @@
 	icon_state = "chaplain"
 	item_state = "bl_suit"
 	item_color = "chapblack"
+	can_adjust = 0
 
 
 /obj/item/clothing/under/rank/chef
@@ -54,6 +55,7 @@
 	item_state = "clown"
 	item_color = "clown"
 	fitted = 0
+	can_adjust = 0
 
 
 /obj/item/clothing/under/rank/head_of_personnel
@@ -62,6 +64,7 @@
 	icon_state = "hop"
 	item_state = "b_suit"
 	item_color = "hop"
+	can_adjust = 0
 
 
 /obj/item/clothing/under/rank/hydroponics
@@ -84,6 +87,7 @@
 /obj/item/clothing/under/lawyer
 	desc = "Slick threads."
 	name = "Lawyer suit"
+	can_adjust = 0
 
 
 /obj/item/clothing/under/lawyer/black
@@ -116,6 +120,7 @@
 	icon_state = "bluesuit"
 	item_state = "bluesuit"
 	item_color = "bluesuit"
+	can_adjust = 1
 
 
 /obj/item/clothing/under/lawyer/purpsuit
@@ -124,6 +129,8 @@
 	item_state = "lawyer_purp"
 	item_color = "lawyer_purp"
 	fitted = 0
+	can_adjust = 1
+
 
 /obj/item/clothing/under/lawyer/blacksuit
 	name = "black suit"
@@ -131,6 +138,8 @@
 	icon_state = "blacksuit"
 	item_state = "ba_suit"
 	item_color = "blacksuit"
+	can_adjust = 1
+
 
 /obj/item/clothing/under/rank/librarian
 	name = "sensible suit"
@@ -138,6 +147,8 @@
 	icon_state = "red_suit"
 	item_state = "red_suit"
 	item_color = "red_suit"
+	can_adjust = 0
+
 
 /obj/item/clothing/under/rank/mime
 	name = "mime's outfit"
@@ -146,9 +157,10 @@
 	item_state = "mime"
 	item_color = "mime"
 
+
 /obj/item/clothing/under/rank/miner
 	desc = "It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty."
 	name = "shaft miner's jumpsuit"
 	icon_state = "miner"
 	item_state = "miner"
-	item_color = "miner"
+	item_color = "miner"

code/modules/clothing/under/jobs/medsci.dm

@@ -8,6 +8,7 @@
 	item_state = "g_suit"
 	item_color = "director"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
+	can_adjust = 0
 
 /obj/item/clothing/under/rank/research_director/alt
 	desc = "Maybe you'll engineer your own half-man, half-pig creature some day. Its fabric provides minor protection from biological contaminants."
@@ -16,7 +17,7 @@
 	item_state = "rdwhimsy"
 	item_color = "rdwhimsy"
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
-
+	can_adjust = 1
 
 /obj/item/clothing/under/rank/scientist
 	desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist."
@@ -76,6 +77,7 @@
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	fitted = 0
+	can_adjust = 0
 
 /obj/item/clothing/under/rank/medical
 	desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
@@ -91,19 +93,21 @@
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."
 	icon_state = "scrubsblue"
 	item_color = "scrubsblue"
+	can_adjust = 0
 
 /obj/item/clothing/under/rank/medical/green
 	name = "medical scrubs"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green."
 	icon_state = "scrubsgreen"
 	item_color = "scrubsgreen"
+	can_adjust = 0
 
 /obj/item/clothing/under/rank/medical/purple
 	name = "medical scrubs"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple."
 	icon_state = "scrubspurple"
 	item_color = "scrubspurple"
-
+	can_adjust = 0
 
 
 
@@ -118,6 +122,7 @@
 	item_color = "genetics_new"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
+	can_adjust = 0
 
 /obj/item/clothing/under/rank/chemist_new
 	desc = "It's made of a special fiber which provides minor protection against biohazards."
@@ -127,6 +132,7 @@
 	item_color = "chemist_new"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
+	can_adjust = 0
 
 /obj/item/clothing/under/rank/scientist_new
 	desc = "Made of a special fiber that gives special protection against biohazards and small explosions."
@@ -136,6 +142,7 @@
 	item_color = "scientist_new"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
+	can_adjust = 0
 
 /obj/item/clothing/under/rank/virologist_new
 	desc = "Made of a special fiber that gives increased protection against biohazards."
@@ -144,4 +151,5 @@
 	item_state = "w_suit"
 	item_color = "virologist_new"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
+	can_adjust = 0

code/modules/clothing/under/jobs/security.dm

@@ -36,6 +36,14 @@
 	item_color = "detective"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 
+/obj/item/clothing/under/det/grey
+	name = "noir suit"
+	desc = "A hard-boiled private investigator's grey suit, complete with tie clip."
+	icon_state = "greydet"
+	item_state = "greydet"
+	item_color = "greydet"
+	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+
 /*
  * Head of Security
  */
@@ -56,6 +64,7 @@
 	icon_state = "jensen"
 	item_state = "jensen"
 	item_color = "jensen"
+	can_adjust = 0
 
 /obj/item/clothing/suit/armor/hos/jensen
 	name = "armored trenchoat"

code/modules/clothing/under/miscellaneous.dm

@@ -4,6 +4,7 @@
 	icon_state = "red_pyjamas"
 	item_color = "red_pyjamas"
 	item_state = "w_suit"
+	can_adjust = 0
 
 /obj/item/clothing/under/pj/blue
 	name = "blue pj's"
@@ -11,6 +12,7 @@
 	icon_state = "blue_pyjamas"
 	item_color = "blue_pyjamas"
 	item_state = "w_suit"
+	can_adjust = 0
 
 /obj/item/clothing/under/scratch
 	name = "white suit"
@@ -18,12 +20,14 @@
 	icon_state = "scratch"
 	item_state = "scratch"
 	item_color = "scratch"
+	can_adjust = 0
 
 /obj/item/clothing/under/sl_suit
 	desc = "It's a very amish looking suit."
 	name = "amish suit"
 	icon_state = "sl_suit"
 	item_color = "sl_suit"
+	can_adjust = 0
 
 /obj/item/clothing/under/roman
 	name = "roman armor"
@@ -31,6 +35,7 @@
 	icon_state = "roman"
 	item_color = "roman"
 	item_state = "armor"
+	can_adjust = 0
 
 /obj/item/clothing/under/waiter
 	name = "waiter's outfit"
@@ -38,6 +43,7 @@
 	icon_state = "waiter"
 	item_state = "waiter"
 	item_color = "waiter"
+	can_adjust = 0
 
 /obj/item/clothing/under/rank/mailman
 	name = "mailman's jumpsuit"
@@ -53,6 +59,7 @@
 	item_state = "sexyclown"
 	item_color = "sexyclown"
 	fitted = 0
+	can_adjust = 0
 
 /obj/item/clothing/under/rank/vice
 	name = "vice officer's jumpsuit"
@@ -60,6 +67,7 @@
 	icon_state = "vice"
 	item_state = "gy_suit"
 	item_color = "vice"
+	can_adjust = 0
 
 /obj/item/clothing/under/rank/centcom_officer
 	desc = "It's a jumpsuit worn by Centcom Officers."
@@ -67,6 +75,7 @@
 	icon_state = "officer"
 	item_state = "g_suit"
 	item_color = "officer"
+	can_adjust = 0
 
 /obj/item/clothing/under/rank/centcom_commander
 	desc = "It's a jumpsuit worn by Centcom's highest-tier Commanders."
@@ -74,6 +83,7 @@
 	icon_state = "centcom"
 	item_state = "dg_suit"
 	item_color = "centcom"
+	can_adjust = 0
 
 /obj/item/clothing/under/space
 	name = "\improper NASA jumpsuit"
@@ -89,6 +99,7 @@
 	min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
+	can_adjust = 0
 
 /obj/item/clothing/under/acj
 	name = "administrative cybernetic jumpsuit"
@@ -104,6 +115,7 @@
 	min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
+	can_adjust = 0
 
 /obj/item/clothing/under/owl
 	name = "owl uniform"
@@ -111,12 +123,14 @@
 	icon_state = "owl"
 	item_color = "owl"
 	fitted = 0
+	can_adjust = 0
 
 /obj/item/clothing/under/johnny
 	name = "johnny~~ jumpsuit"
 	desc = "Johnny~~"
 	icon_state = "johnny"
 	item_color = "johnny"
+	can_adjust = 0
 
 /obj/item/clothing/under/rainbow
 	name = "rainbow"
@@ -124,12 +138,14 @@
 	icon_state = "rainbow"
 	item_state = "rainbow"
 	item_color = "rainbow"
+	can_adjust = 0
 
 /obj/item/clothing/under/cloud
 	name = "cloud"
 	desc = "cloud"
 	icon_state = "cloud"
 	item_color = "cloud"
+	can_adjust = 0
 
 /obj/item/clothing/under/gimmick/rank/captain/suit
 	name = "captain's suit"
@@ -137,6 +153,7 @@
 	icon_state = "green_suit"
 	item_state = "dg_suit"
 	item_color = "green_suit"
+	can_adjust = 0
 
 /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit
 	name = "head of personnel's suit"
@@ -144,6 +161,7 @@
 	icon_state = "teal_suit"
 	item_state = "g_suit"
 	item_color = "teal_suit"
+	can_adjust = 0
 
 /obj/item/clothing/under/suit_jacket
 	name = "black suit"
@@ -151,6 +169,7 @@
 	icon_state = "black_suit"
 	item_state = "bl_suit"
 	item_color = "black_suit"
+	can_adjust = 0
 
 /obj/item/clothing/under/suit_jacket/really_black
 	name = "executive suit"
@@ -158,6 +177,7 @@
 	icon_state = "really_black_suit"
 	item_state = "bl_suit"
 	item_color = "black_suit"
+	can_adjust = 0
 
 /obj/item/clothing/under/suit_jacket/female
 	name = "executive suit"
@@ -172,6 +192,7 @@
 	icon_state = "red_suit"
 	item_state = "r_suit"
 	item_color = "red_suit"
+	can_adjust = 0
 
 /obj/item/clothing/under/suit_jacket/charcoal
 	name = "charcoal suit"
@@ -179,6 +200,7 @@
 	icon_state = "charcoal_suit"
 	item_state = "charcoal_suit"
 	item_color = "charcoal_suit"
+	can_adjust = 0
 
 /obj/item/clothing/under/suit_jacket/navy
 	name = "navy suit"
@@ -186,6 +208,7 @@
 	icon_state = "navy_suit"
 	item_state = "navy_suit"
 	item_color = "navy_suit"
+	can_adjust = 0
 
 /obj/item/clothing/under/suit_jacket/burgundy
 	name = "burgundy suit"
@@ -193,6 +216,7 @@
 	icon_state = "burgundy_suit"
 	item_state = "burgundy_suit"
 	item_color = "burgundy_suit"
+	can_adjust = 0
 
 /obj/item/clothing/under/suit_jacket/checkered
 	name = "checkered suit"
@@ -200,6 +224,7 @@
 	icon_state = "checkered_suit"
 	item_state = "checkered_suit"
 	item_color = "checkered_suit"
+	can_adjust = 0
 
 /obj/item/clothing/under/suit_jacket/tan
 	name = "tan suit"
@@ -207,6 +232,7 @@
 	icon_state = "tan_suit"
 	item_state = "tan_suit"
 	item_color = "tan_suit"
+	can_adjust = 0
 
 /obj/item/clothing/under/blackskirt
 	name = "black skirt"
@@ -215,6 +241,7 @@
 	item_color = "blackskirt"
 	body_parts_covered = CHEST|GROIN|ARMS
 	fitted = 0
+	can_adjust = 0
 
 /obj/item/clothing/under/schoolgirl
 	name = "schoolgirl uniform"
@@ -224,6 +251,7 @@
 	item_color = "schoolgirl"
 	body_parts_covered = CHEST|GROIN|ARMS
 	fitted = 0
+	can_adjust = 0
 
 /obj/item/clothing/under/overalls
 	name = "laborer's overalls"
@@ -231,6 +259,7 @@
 	icon_state = "overalls"
 	item_state = "lb_suit"
 	item_color = "overalls"
+	can_adjust = 0
 
 /obj/item/clothing/under/pirate
 	name = "pirate outfit"
@@ -238,6 +267,7 @@
 	icon_state = "pirate"
 	item_state = "pirate"
 	item_color = "pirate"
+	can_adjust = 0
 
 /obj/item/clothing/under/soviet
 	name = "soviet uniform"
@@ -245,6 +275,7 @@
 	icon_state = "soviet"
 	item_state = "soviet"
 	item_color = "soviet"
+	can_adjust = 0
 
 /obj/item/clothing/under/redcoat
 	name = "redcoat uniform"
@@ -252,6 +283,7 @@
 	icon_state = "redcoat"
 	item_state = "redcoat"
 	item_color = "redcoat"
+	can_adjust = 0
 
 /obj/item/clothing/under/kilt
 	name = "kilt"
@@ -261,6 +293,7 @@
 	item_color = "kilt"
 	body_parts_covered = CHEST|GROIN|FEET
 	fitted = 0
+	can_adjust = 0
 
 /obj/item/clothing/under/sexymime
 	name = "sexy mime outfit"
@@ -270,6 +303,7 @@
 	item_color = "sexymime"
 	body_parts_covered = CHEST|GROIN|LEGS
 	fitted = 0
+	can_adjust = 0
 
 /obj/item/clothing/under/gladiator
 	name = "gladiator uniform"
@@ -279,6 +313,7 @@
 	item_color = "gladiator"
 	body_parts_covered = CHEST|GROIN|ARMS
 	fitted = 0
+	can_adjust = 0
 
 /obj/item/clothing/under/sundress
 	name = "sundress"
@@ -288,6 +323,7 @@
 	item_color = "sundress"
 	body_parts_covered = CHEST|GROIN
 	fitted = 0
+	can_adjust = 0
 
 /obj/item/clothing/under/captainformal
 	name = "captain's formal uniform"
@@ -295,6 +331,7 @@
 	icon_state = "captain_formal"
 	item_state = "by_suit"
 	item_color = "captain_formal"
+	can_adjust = 0
 
 /obj/item/clothing/under/hosformalmale
 	name = "head of security's formal uniform"
@@ -302,6 +339,7 @@
 	icon_state = "hos_formal_male"
 	item_state = "r_suit"
 	item_color = "hos_formal_male"
+	can_adjust = 0
 
 /obj/item/clothing/under/hosformalfem
 	name = "head of security's formal uniform"
@@ -310,6 +348,7 @@
 	item_state = "r_suit"
 	item_color = "hos_formal_fem"
 	fitted = 0
+	can_adjust = 0
 
 /obj/item/clothing/under/assistantformal
 	name = "assistant's formal uniform"
@@ -317,6 +356,7 @@
 	icon_state = "assistant_formal"
 	item_state = "gy_suit"
 	item_color = "assistant_formal"
+	can_adjust = 0
 
 /obj/item/clothing/under/blacktango
 	name = "black tango dress"
@@ -324,4 +364,5 @@
 	icon_state = "black_tango"
 	item_state = "wcoat"
 	item_color = "black_tango"
-	fitted = 0
+	fitted = 0
+	can_adjust = 0

code/modules/clothing/under/shorts.dm

@@ -4,6 +4,7 @@
 	gender = PLURAL
 	body_parts_covered = GROIN
 	fitted = 0
+	can_adjust = 0
 
 /obj/item/clothing/under/shorts/red
 	icon_state = "redshorts"

code/modules/clothing/under/syndicate.dm

@@ -16,5 +16,4 @@
 	icon_state = "tactifool"
 	item_state = "bl_suit"
 	item_color = "tactifool"
-
-
+	can_adjust = 0

code/modules/food&drinks/drinks/drinks.dm

@@ -261,11 +261,19 @@
 	volume = 100
 
 /obj/item/weapon/reagent_containers/food/drinks/flask
-	name = "Captain's Flask"
-	desc = "A metal flask belonging to the captain"
+	name = "captain's flask"
+	desc = "A silver flask belonging to the captain"
 	icon_state = "flask"
 	volume = 60
 
+/obj/item/weapon/reagent_containers/food/drinks/flask/det
+	name = "detective's flask"
+	desc = "The detective's only true friend."
+	icon_state = "detflask"
+	New()
+		..()
+		reagents.add_reagent("whiskey", 30)
+
 /obj/item/weapon/reagent_containers/food/drinks/britcup
 	name = "cup"
 	desc = "A cup with the british flag emblazoned on it."

html/changelogs/Paprka-PR-5051.yml

@@ -0,0 +1,7 @@
+author: Paprka
+
+delete-after: True
+
+changes: 
+  - rscadd: Added jumpsuit adjusting. Adjust your jumpsuit to wear it more casually by rolling it down or roll up those sleeves of that hard-worn suit!
+  - rscadd: Added a grey alternative to the detective's suit and trenchcoat. Now you can be a noir private investigator!