Merge pull request #8743 from Cerebulon/new_basics_engineering

Basic Uniform Polish: Engineering

code/modules/clothing/suits/jobs.dm

@@ -169,6 +169,26 @@
 	/obj/item/tool/crowbar, /obj/item/tool/screwdriver, /obj/item/weldingtool, /obj/item/tool/wirecutters, /obj/item/tool/wrench, /obj/item/tank/emergency/oxygen,
 	/obj/item/clothing/mask/gas, /obj/item/taperoll/engineering)
 	body_parts_covered = UPPER_TORSO
+	var/open = 0	//0 is closed, 1 is open, -1 means it won't be able to toggle
+
+/obj/item/clothing/suit/storage/hazardvest/verb/Toggle()
+	set name = "Toggle Hazard Vest"
+	set category = "Object"
+	set src in usr
+	if(!usr.canmove || usr.stat || usr.restrained())
+		return 0
+	if(open == 1)
+		open = 0
+		icon_state = initial(icon_state)
+		to_chat(usr, "You fasten up the [src]].")
+	else if(open == 0)
+		open = 1
+		icon_state = "[icon_state]_open"
+		to_chat(usr, "You unfasten the [src]].")
+	else
+		to_chat(usr, "You attempt to button-up the velcro on your [src], before promptly realising how silly you are.")
+		return
+	update_clothing_icon()
 
 /obj/item/clothing/suit/storage/hazardvest/blue
 	name = "blue hazard vest"
@@ -182,7 +202,7 @@
 
 /obj/item/clothing/suit/storage/hazardvest/white
 	name = "white hazard vest"
-	desc = "A high-visibility vest used in work zones. This one has a red cross!"
+	desc = "A high-visibility vest used in work zones. This one is white!"
 	icon_state = "hazard_w"
 
 //Lawyer
@@ -245,4 +265,4 @@
 	icon = 'icons/obj/clothing/belts.dmi'
 	icon_state = "suspenders"
 	blood_overlay_type = "armor" //it's the less thing that I can put here
-	body_parts_covered = 0
+	body_parts_covered = 0

code/modules/clothing/suits/miscellaneous.dm

@@ -225,8 +225,8 @@
 /*
  * Misc
  */
-/obj/item/clothing/suit/straight_jacket
-	name = "straight jacket"
+/obj/item/clothing/suit/straight_jacket //A mispelling from time immemorial...
+	name = "straitjacket"
 	desc = "A suit that completely restrains the wearer."
 	icon_state = "straight_jacket"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS

code/modules/clothing/under/accessories/storage.dm

@@ -103,3 +103,17 @@
 
 	new /obj/item/material/knife/machete/hatchet/unathiknife(hold)
 	new /obj/item/material/knife/machete/hatchet/unathiknife(hold)
+
+/obj/item/clothing/accessory/storage/overalls
+	name = "overalls"
+	desc = "Heavy-duty overalls for use on the work site, with plenty of convenient pockets to boot."
+	icon_state = "mining_overalls"
+
+/obj/item/clothing/accessory/storage/overalls/engineer
+	name = "engineer's overalls"
+	icon_state = "engineering_overalls"
+
+/obj/item/clothing/accessory/storage/overalls/chief
+	name = "chief engineer's overalls"
+	desc = "Heavy duty overalls, bleached white to signify a \"Chief Engineer.\" Keeping them clean until the end of shift is a challenge unto itself."
+	icon_state = "ce_overalls"

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

@@ -1,5 +1,15 @@
 //Alphabetical order of civilian jobs.
 
+/obj/item/clothing/under/rank/assistant
+	name = "assistant's uniform"
+	desc = "A NanoTrasen-branded jumpsuit in fetching ocean grey."
+	icon_state = "assistant"
+
+/obj/item/clothing/under/rank/assistant/engineer
+	name = "technical assistant's uniform"
+	desc = "A NanoTrasen-branded jumpsuit in fetching ocean grey with engineering yellow accents."
+	icon_state = "assistant_eng"
+
 /obj/item/clothing/under/rank/bartender
 	desc = "It looks like it could use some more flair."
 	name = "bartender's uniform"