WIP

cmss13-devs · Jul 14, 2024 · 361cd72 · 361cd72
1 parent 231226b
commit 361cd72
Show file tree

Hide file tree

Showing 7 changed files with 391 additions and 410 deletions.
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
@@ -96,9 +96,6 @@
 		WEAR_JACKET = 'icons/mob/humans/onmob/suit-layer/suit_marine.dmi'
 	)
 
-/obj/item/clothing/suit/armor/vest/pilot/Initialize()
-	. = ..()
-	select_gamemode_skin(/obj/item/clothing/suit/armor/vest/pilot)
 
 /obj/item/clothing/suit/armor/vest/dutch
 	name = "armored jacket"

diff --git a/code/modules/clothing/suits/civilian_suit.dm b/code/modules/clothing/suits/civilian_suit.dm
@@ -158,7 +158,7 @@
 		/obj/item/tool/pen,
 	)
 
-//Engineering
+// Hazard Vest
 /obj/item/clothing/suit/storage/hazardvest
 	name = "orange hazard vest"
 	desc = "An orange high-visibility vest used in work zones."
@@ -221,3 +221,91 @@
 	desc = "A niche-market, black, allegedly high-visibility vest supposedly used in work zones. Features extra-reflective tapes. The etiquette on the vest insists that it's fully compliant with all the United American workplace safety standards."
 	icon_state = "hazard_black"
 	item_state = "hazard_black"
+
+// Windbreakers
+
+/obj/item/clothing/suit/storage/windbreaker
+	name = "windbreaker parent object"
+	desc = "This shouldn't be here..."
+	blood_overlay_type = "armor"
+	allowed = list(
+		/obj/item/storage/fancy/cigarettes,
+		/obj/item/tool/lighter,
+		/obj/item/weapon/baton,
+		/obj/item/handcuffs,
+		/obj/item/device/binoculars,
+		/obj/item/attachable/bayonet,
+
+		/obj/item/storage/belt/gun/m4a3,
+		/obj/item/storage/belt/gun/m44,
+		/obj/item/storage/belt/gun/mateba,
+		/obj/item/storage/belt/gun/smartpistol,
+		/obj/item/weapon/gun,
+
+		/obj/item/device/flashlight,
+		/obj/item/device/healthanalyzer,
+		/obj/item/device/radio,
+		/obj/item/tank/emergency_oxygen,
+		/obj/item/tool/crowbar,
+		/obj/item/tool/crew_monitor,
+		/obj/item/tool/pen,
+		/obj/item/storage/large_holster/machete,
+		/obj/item/storage/large_holster/katana,
+		/obj/item/device/motiondetector,
+	)
+	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS
+	valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL)
+	restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND)
+	var/zip_unzip = FALSE
+	actions_types = list(/datum/action/item_action/toggle)
+
+/obj/item/clothing/suit/storage/windbreaker/attack_self(mob/user) //Adds UI button
+	..()
+
+	if(!ishuman(user))
+		return
+
+	var/mob/living/carbon/human/H = user
+	if(H.wear_suit != src)
+		return
+
+	playsound(user, "sound/items/zip.ogg", 10, TRUE)
+	zip_unzip(user)
+
+/obj/item/clothing/suit/storage/windbreaker/proc/zip_unzip(mob/user)
+
+	if(zip_unzip)
+		icon_state = initial(icon_state)
+		to_chat(user, SPAN_NOTICE("You zip \the [src]."))
+
+	else
+		icon_state = "[initial(icon_state)]_o"
+		to_chat(user, SPAN_NOTICE("You unzip \the [src]."))
+	zip_unzip = !zip_unzip
+
+	update_clothing_icon()
+
+/obj/item/clothing/suit/storage/windbreaker/windbreaker_brown
+	name = "brown windbreaker"
+	desc = "A brown windbreaker."
+	icon_state = "windbreaker_brown"
+
+/obj/item/clothing/suit/storage/windbreaker/windbreaker_gray
+	name = "gray windbreaker"
+	desc = "A gray windbreaker."
+	icon_state = "windbreaker_gray"
+
+/obj/item/clothing/suit/storage/windbreaker/windbreaker_green
+	name = "green windbreaker"
+	desc = "A green windbreaker."
+	icon_state = "windbreaker_green"
+
+/obj/item/clothing/suit/storage/windbreaker/windbreaker_fr
+	name = "first responder windbreaker"
+	desc = "A brown windbreaker with reflective strips commonly worn by first responders."
+	icon_state = "windbreaker_fr"
+
+/obj/item/clothing/suit/storage/windbreaker/windbreaker_covenant
+	name = "explorer's windbreaker"
+	desc = "A brown windbreaker covered in various patches tying it to one of the first explorations into this sector."
+	icon_state = "windbreaker_covenant"
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
@@ -32,90 +32,3 @@
 
 */
 
-//Windbreakers
-/obj/item/clothing/suit/storage/windbreaker
-	name = "windbreaker parent object"
-	desc = "This shouldn't be here..."
-	blood_overlay_type = "armor"
-	allowed = list(
-		/obj/item/storage/fancy/cigarettes,
-		/obj/item/tool/lighter,
-		/obj/item/weapon/baton,
-		/obj/item/handcuffs,
-		/obj/item/device/binoculars,
-		/obj/item/attachable/bayonet,
-
-		/obj/item/storage/belt/gun/m4a3,
-		/obj/item/storage/belt/gun/m44,
-		/obj/item/storage/belt/gun/mateba,
-		/obj/item/storage/belt/gun/smartpistol,
-		/obj/item/weapon/gun,
-
-		/obj/item/device/flashlight,
-		/obj/item/device/healthanalyzer,
-		/obj/item/device/radio,
-		/obj/item/tank/emergency_oxygen,
-		/obj/item/tool/crowbar,
-		/obj/item/tool/crew_monitor,
-		/obj/item/tool/pen,
-		/obj/item/storage/large_holster/machete,
-		/obj/item/storage/large_holster/katana,
-		/obj/item/device/motiondetector,
-	)
-	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS
-	valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL)
-	restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND)
-	var/zip_unzip = FALSE
-	actions_types = list(/datum/action/item_action/toggle)
-
-/obj/item/clothing/suit/storage/windbreaker/attack_self(mob/user) //Adds UI button
-	..()
-
-	if(!ishuman(user))
-		return
-
-	var/mob/living/carbon/human/H = user
-	if(H.wear_suit != src)
-		return
-
-	playsound(user, "sound/items/zip.ogg", 10, TRUE)
-	zip_unzip(user)
-
-/obj/item/clothing/suit/storage/windbreaker/proc/zip_unzip(mob/user)
-
-	if(zip_unzip)
-		icon_state = initial(icon_state)
-		to_chat(user, SPAN_NOTICE("You zip \the [src]."))
-
-	else
-		icon_state = "[initial(icon_state)]_o"
-		to_chat(user, SPAN_NOTICE("You unzip \the [src]."))
-	zip_unzip = !zip_unzip
-
-	update_clothing_icon()
-
-/obj/item/clothing/suit/storage/windbreaker/windbreaker_brown
-	name = "brown windbreaker"
-	desc = "A brown windbreaker."
-	icon_state = "windbreaker_brown"
-
-/obj/item/clothing/suit/storage/windbreaker/windbreaker_gray
-	name = "gray windbreaker"
-	desc = "A gray windbreaker."
-	icon_state = "windbreaker_gray"
-
-/obj/item/clothing/suit/storage/windbreaker/windbreaker_green
-	name = "green windbreaker"
-	desc = "A green windbreaker."
-	icon_state = "windbreaker_green"
-
-/obj/item/clothing/suit/storage/windbreaker/windbreaker_fr
-	name = "first responder windbreaker"
-	desc = "A brown windbreaker with reflective strips commonly worn by first responders."
-	icon_state = "windbreaker_fr"
-
-/obj/item/clothing/suit/storage/windbreaker/windbreaker_covenant
-	name = "explorer's windbreaker"
-	desc = "A brown windbreaker covered in various patches tying it to one of the first explorations into this sector."
-	icon_state = "windbreaker_covenant"
-