Новые спрайты одежды карго

code/datums/outfits/jobs/cargo.dm

@@ -3,7 +3,6 @@
 	name = OUTFIT_JOB_NAME("Quartermaster")
 
 	uniform = /obj/item/clothing/under/rank/cargo
-	uniform_f = /obj/item/clothing/under/rank/cargo_fem
 	shoes =  /obj/item/clothing/shoes/brown
 	glasses = /obj/item/clothing/glasses/sunglasses
 
@@ -43,7 +42,6 @@
 
 	uniform = /obj/item/clothing/under/rank/recycler
 	shoes = /obj/item/clothing/shoes/black
-	suit = /obj/item/clothing/suit/recyclervest
 
 	l_ear = /obj/item/device/radio/headset/headset_cargo
 	belt = /obj/item/device/pda/cargo

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

@@ -11,7 +11,7 @@
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/device/radio/headset/headset_cargo(src)
 	new /obj/item/clothing/gloves/brown(src)
-	new /obj/item/clothing/head/soft(src)
+	new /obj/item/clothing/head/soft/cargo(src)
 //	new /obj/item/weapon/cartridge/quartermaster(src)
 	if(SSenvironment.envtype[z] == ENV_TYPE_SNOW)
 		new /obj/item/clothing/suit/hooded/wintercoat/cargo(src)
@@ -32,7 +32,6 @@
 	new /obj/item/device/remote_device/quartermaster(src)
 	new /obj/item/clothing/suit/storage/postal_dude_coat(src)
 	new /obj/item/clothing/under/rank/cargo(src)
-	new /obj/item/clothing/under/rank/cargo_fem(src)
 	new /obj/item/clothing/shoes/brown(src)
 	new /obj/item/device/radio/headset/headset_cargo(src)
 	new /obj/item/clothing/gloves/black(src)
@@ -42,7 +41,7 @@
 	new /obj/item/weapon/tank/air(src)
 	new /obj/item/clothing/mask/gas/coloured(src)
 	new /obj/item/clothing/glasses/meson(src)
-	new /obj/item/clothing/head/soft(src)
+	new /obj/item/clothing/head/soft/cargo(src)
 	new /obj/item/weapon/mining_voucher(src)
 	new /obj/item/weapon/survivalcapsule(src)
 	new /obj/item/clothing/accessory/medal/cargo(src)
@@ -62,15 +61,13 @@
 	new /obj/item/weapon/shovel(src)
 	new /obj/item/weapon/storage/bag/trash/miners(src)
 	new /obj/item/clothing/under/rank/recycler(src)
-	new /obj/item/clothing/under/rank/recyclercasual(src)
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/device/radio/headset/headset_cargo(src)
 	new /obj/item/clothing/gloves/black(src)
+	new /obj/item/clothing/head/soft/cargo(src)
 	new /obj/item/clothing/head/helmet/space/globose/recycler(src)
 	new /obj/item/clothing/suit/space/globose/recycler(src)
-	new /obj/item/clothing/head/soft/trash(src)
 	new /obj/item/clothing/mask/breath(src)
-	new /obj/item/clothing/suit/recyclervest(src)
 	if(SSenvironment.envtype[z] == ENV_TYPE_SNOW)
 		new /obj/item/clothing/suit/hooded/wintercoat/cargo(src)
 		new /obj/item/clothing/shoes/winterboots(src)

code/modules/clothing/head/soft_caps.dm

@@ -1,15 +1,15 @@
 /obj/item/clothing/head/soft
-	name = "cargo cap"
-	desc = "It's a baseball hat in a tasteless yellow color."
-	icon_state = "cargosoft"
+	name = "cap"
+	desc = "It's a baseball hat"
+	icon_state = "greysoft"
 	flags = HEADCOVERSEYES
 	siemens_coefficient = 0.9
 	body_parts_covered = 0
 	dyed_type = DYED_SOFTCAP
 	item_action_types = list(/datum/action/item_action/hands_free/flip_cap)
 
 	var/flipped = FALSE
-	var/cap_color = "cargo"
+	var/cap_color = "grey"
 
 /datum/action/item_action/hands_free/flip_cap
 	name = "Flip Cap"
@@ -107,12 +107,6 @@
 	icon_state = "corpsoft"
 	cap_color = "corp"
 
-/obj/item/clothing/head/soft/trash
-	name = "trash cap"
-	desc = "It's baseball hat."
-	icon_state = "trashsoft"
-	cap_color = "trash"
-
 /obj/item/clothing/head/soft/janitor
 	name = "janitor cap"
 	desc = "It's janitor hat."
@@ -138,3 +132,10 @@
 	desc = "It's baseball hat in tasteful black color with blueshield insignia."
 	icon_state = "blueshieldsoft"
 	cap_color = "blueshield"
+
+/obj/item/clothing/head/soft/cargo
+	name = "cargo cap"
+	desc = "It's cargo hat."
+	item_state_inventory = "cargosoft"
+	cap_color = "cargo"
+

code/modules/clothing/suits/jobs.dm

@@ -289,37 +289,6 @@
 	blood_overlay_type = "armor" //it's the less thing that I can put here
 	body_parts_covered = 0
 
-//Recycler
-/obj/item/clothing/suit/recyclervest
-	name = "recycler vest"
-	desc = "This is Recycler vest."
-	icon = 'icons/obj/clothing/suits.dmi'
-	icon_state = "recycler_vest_open"
-	item_state = "recycler_vest"
-	blood_overlay_type = "coat" //it's the less thing that I can put here
-	body_parts_covered = 0
-	item_action_types = list(/datum/action/item_action/hands_free/toggle_vest_buttons)
-
-/datum/action/item_action/hands_free/toggle_vest_buttons
-	name = "Toggle vest buttons"
-
-/datum/action/item_action/hands_free/toggle_vest_buttons/Activate()
-	var/obj/item/clothing/suit/recyclervest/S = target
-	S.toggle()
-
-/obj/item/clothing/suit/recyclervest/proc/toggle()
-    switch(icon_state)
-        if("recycler_vest_open")
-            src.icon_state = "recycler_vest"
-            to_chat(usr, "You button up the vest.")
-        if("recycler_vest")
-            src.icon_state = "recycler_vest_open"
-            to_chat(usr, "You unbutton the jacket.")
-        else
-            to_chat(usr, "You attempt to button-up the velcro on your [src], before promptly realising how retarded you are.")
-            return
-    update_inv_mob() //so our overlays update
-
 /obj/item/clothing/suit/surgicalapron
 	name = "surgical apron"
 	desc = "A sterile blue apron for performing surgery."

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

@@ -25,6 +25,8 @@
 	desc = "It's a jumpsuit worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
 	icon_state = "qm"
 	item_state = "qm"
+	item_state_world = "qm_w"
+
 	flags = ONESIZEFITSALL|HEAR_TALK
 
 
@@ -33,6 +35,8 @@
 	desc = "Shooooorts! They're comfy and easy to wear!"
 	icon_state = "cargotech"
 	item_state = "cargo"
+	item_state_world = "cargotech_w"
+
 	flags = ONESIZEFITSALL|HEAR_TALK
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
@@ -41,16 +45,10 @@
 	desc = "Stinks."
 	icon_state = "recycler"
 	item_state = "recycler"
-	flags = ONESIZEFITSALL|HEAR_TALK
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+	item_state_world = "recycler_w"
 
-/obj/item/clothing/under/rank/recyclercasual
-	name = "recycler's casual jumpsuit"
-	desc = "Stinks."
-	icon_state = "recyclercasual"
-	item_state = "recyclercasual"
 	flags = ONESIZEFITSALL|HEAR_TALK
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
 /obj/item/clothing/under/rank/chaplain
 	desc = "It's a dark robe, often worn by religious folk."
@@ -66,14 +64,14 @@
 	item_state = "chaplain_light"
 
 
+//Chef
 /obj/item/clothing/under/rank/chef
 	desc = "It's an apron which is given only to the most <b>hardcore</b> chefs in space."
 	name = "chef's uniform"
 	icon_state = "chef_uniform"
 	item_state = "chef_uniform"
 	flags = ONESIZEFITSALL|HEAR_TALK
 
-//Chef
 /obj/item/clothing/under/rank/chef/sushi
 	name = "sushi master robe"
 	desc = "The one who wears this clearly knows a lot about fish, rice and perfectly understands the moonspeak."
@@ -189,6 +187,7 @@
 	name = "shaft miner's jumpsuit"
 	icon_state = "miner"
 	item_state = "miner"
+	item_state_world = "miner_w"
 	flags = ONESIZEFITSALL|HEAR_TALK
 
 /obj/item/clothing/under/rank/barber

code/modules/clothing/under/miscellaneous.dm

@@ -457,12 +457,6 @@
 	icon_state = "skirt_cadet"
 	item_state = "skirt_cadet"
 
-/obj/item/clothing/under/rank/cargo_fem
-	name = "quartermaster's dress"
-	desc = "It's a jumpsuit worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
-	icon_state = "qm_f"
-	item_state = "qm_f"
-
 /obj/item/clothing/under/rank/head_of_security_fem
 	desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer."
 	name = "head of security's dress"

maps/boxstation/boxstation.dmm

@@ -68852,7 +68852,6 @@
 /area/station/medical/medbreak)
 "cLh" = (
 /obj/structure/table,
-/obj/item/clothing/head/soft/trash,
 /turf/simulated/floor/plating,
 /area/station/maintenance/engineering)
 "cLi" = (