Update engineering.dm

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

@@ -1,39 +1,3 @@
-<<<<<<< HEAD
-//Contains: Engineering department jumpsuits
-/obj/item/clothing/under/rank/chief_engineer
-	desc = "It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of \"Chief Engineer\". It has minor radiation shielding."
-	name = "chief engineer's jumpsuit"
-	icon_state = "chiefengineer"
-	item_state = "gy_suit"
-	item_color = "chief"
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10, fire = 80, acid = 40)
-	resistance_flags = 0
-
-/obj/item/clothing/under/rank/atmospheric_technician
-	desc = "It's a jumpsuit worn by atmospheric technicians."
-	name = "atmospheric technician's jumpsuit"
-	icon_state = "atmos"
-	item_state = "atmos_suit"
-	item_color = "atmos"
-	resistance_flags = 0
-
-/obj/item/clothing/under/rank/engineer
-	desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."
-	name = "engineer's jumpsuit"
-	icon_state = "engine"
-	item_state = "engi_suit"
-	item_color = "engine"
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10, fire = 60, acid = 20)
-	resistance_flags = 0
-
-/obj/item/clothing/under/rank/roboticist
-	desc = "It's a slimming black with reinforced seams; great for industrial work."
-	name = "roboticist's jumpsuit"
-	icon_state = "robotics"
-	item_state = "robotics"
-	item_color = "robotics"
-	resistance_flags = 0
-=======
 //Contains: Engineering department jumpsuits
 /obj/item/clothing/under/rank/chief_engineer
 	desc = "It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of \"Chief Engineer\". It has minor radiation shielding."
@@ -67,5 +31,4 @@
 	icon_state = "robotics"
 	item_state = "robotics"
 	item_color = "robotics"
-	resistance_flags = NONE
->>>>>>> b0f24a8... Fixes bartender suit having an adjust state (#32968)
+	resistance_flags = NONE