Merge branch 'master' into trek_tmp

# Conflicts Resolved: # icons/obj/clothing/uniforms.dmi
2020-04-19 09:51:21 +03:00
parent 64116857cf f714403d6e
commit 043950a3ee
247 changed files with 392 additions and 245 deletions
@@ -18,7 +18,7 @@
 /obj/item/clothing/under/rank/cargo/tech
 	name = "cargo technician's jumpsuit"
 	desc = "Shooooorts! They're comfy and easy to wear!"
-	icon_state = "cargotech"
+	icon_state = "cargo"
 	item_state = "lb_suit"
 	body_parts_covered = CHEST|GROIN|ARMS
 	alt_covers_chest = TRUE