Updates the "Slim" belt reskin and code cleanup of no longer used "pe…

…acekeeper" belts (#552) (#1725) * slim -> upstream basic * remove overridden override (this is physically inaccessible code) * removes peacekeeper belt (no longer used item) * peacekeeper webbing is now just a reskin of TG webbing (until TG resprites it and I can remove this thing) * removes unused icons too * override woes and a CI fix * okay fine you win shitcode you win * fine. FINE. you WIN. i regret making you, you evil item. * ok yea that ones on me * oh my godddddd * Forgive me. Forgive me. Co-authored-by: OrionTheFox <[email protected]>
Fluffy-Frontier · Jan 31, 2024 · 0a60401 · 0a60401
1 parent d389029
commit 0a60401
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 108 deletions.
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
@@ -354,23 +354,6 @@
 	inhand_icon_state = "security"//Could likely use a better one.
 	worn_icon_state = "security"
 	content_overlays = TRUE
-	// NOVA EDIT ADDITION START
-	uses_advanced_reskins = TRUE
-	unique_reskin = list(
-		"Basic Security" = list(
-			RESKIN_ICON = 'icons/obj/clothing/belts.dmi',
-			RESKIN_ICON_STATE = "security",
-			RESKIN_WORN_ICON = 'icons/mob/clothing/belt.dmi',
-			RESKIN_WORN_ICON_STATE = "security"
-		),
-		"Peacekeeper" = list(
-			RESKIN_ICON = 'modular_nova/master_files/icons/obj/clothing/belts.dmi',
-			RESKIN_ICON_STATE = "peacekeeperbelt",
-			RESKIN_WORN_ICON = 'modular_nova/master_files/icons/mob/clothing/belt.dmi',
-			RESKIN_WORN_ICON_STATE = "peacekeeperbelt"
-		)
-	)
-	// NOVA EDIT ADDITION END
 
 /obj/item/storage/belt/security/Initialize(mapload)
 	. = ..()

diff --git a/modular_nova/master_files/icons/mob/clothing/belt.dmi b/modular_nova/master_files/icons/mob/clothing/belt.dmi
diff --git a/modular_nova/master_files/icons/obj/clothing/belts.dmi b/modular_nova/master_files/icons/obj/clothing/belts.dmi
diff --git a/modular_nova/modules/customization/modules/clothing/storage/belts.dm b/modular_nova/modules/customization/modules/clothing/storage/belts.dm
@@ -110,7 +110,7 @@
 	name = "storage pouch"
 	desc = span_notice("Click on this to open your belt's inventory!")
 	icon_state = "storage_pouch_icon"
-	worn_icon_state = "no_name"	//Intentionally sets the worn icon to an error
+	worn_icon_state = "storage_pouch_icon"
 	w_class = WEIGHT_CLASS_BULKY //Still cant put it in your bags, its technically a belt
 	anchored = 1	//Dont want people taking it out with their hands
 

diff --git a/modular_nova/modules/goofsec/code/sec_clothing_overrides.dm b/modular_nova/modules/goofsec/code/sec_clothing_overrides.dm
@@ -133,21 +133,29 @@
 			RESKIN_ICON_STATE = "belt_white",
 			RESKIN_WORN_ICON_STATE = "belt_white"
 		),
-		"Slim Variant" = list(
-			RESKIN_ICON_STATE = "belt_slim",
-			RESKIN_WORN_ICON_STATE = "belt_slim"
+		"Basic Variant" = list(
+			RESKIN_ICON = 'icons/obj/clothing/belts.dmi',
+			RESKIN_ICON_STATE = "security",
+			RESKIN_WORN_ICON = 'icons/mob/clothing/belt.dmi',
+			RESKIN_WORN_ICON_STATE = "security"
 		),
 	)
 
 /obj/item/storage/belt/security/webbing
+	icon = 'icons/obj/clothing/belts.dmi'
+	worn_icon = 'icons/mob/clothing/belt.dmi'
 	uses_advanced_reskins = FALSE
 	unique_reskin = NONE
 	current_skin = "securitywebbing" //Prevents reskinning
 
-/obj/item/storage/belt/security/webbing/peacekeeper //did I mention this codebase is fucking awful
+/obj/item/storage/belt/security/webbing/peacekeeper
+	icon = 'modular_nova/master_files/icons/obj/clothing/belts.dmi'
+	worn_icon = 'modular_nova/master_files/icons/mob/clothing/belt.dmi'
 	current_skin = "peacekeeper_webbing"
 
-/obj/item/storage/belt/security/webbing/peacekeeper/armadyne
+/obj/item/storage/belt/security/webbing/armadyne
+	icon = 'modular_nova/master_files/icons/obj/clothing/belts.dmi'
+	worn_icon = 'modular_nova/master_files/icons/mob/clothing/belt.dmi'
 	current_skin = "armadyne_webbing"
 
 ///Enables you to quickdraw weapons from security holsters

diff --git a/modular_nova/modules/sec_haul/code/peacekeeper/armadyne_clothing.dm b/modular_nova/modules/sec_haul/code/peacekeeper/armadyne_clothing.dm
@@ -73,23 +73,21 @@
 	inhand_icon_state = "jackboots"
 	worn_icon_state = "armadyne_boots"
 
-
-/obj/item/storage/belt/security/webbing/peacekeeper/armadyne
-	name = "armadyne webbing"
-	desc = "Unique and versatile chest rig, can hold security gear."
-	icon = 'modular_nova/master_files/icons/obj/clothing/belts.dmi'
-	worn_icon = 'modular_nova/master_files/icons/mob/clothing/belt.dmi'
-	icon_state = "armadyne_webbing"
-	worn_icon_state = "armadyne_webbing"
-
-/obj/item/storage/belt/security/peacekeeper/armadyne
+/obj/item/storage/belt/security/armadyne
 	name = "armadyne belt"
 	desc = "Can hold security gear like handcuffs and flashes. Has a holster for a gun."
 	icon = 'modular_nova/master_files/icons/obj/clothing/belts.dmi'
 	worn_icon = 'modular_nova/master_files/icons/mob/clothing/belt.dmi'
 	icon_state = "armadyne_belt"
 	worn_icon_state = "armadyne_belt"
 
+/obj/item/storage/belt/security/webbing/armadyne
+	name = "armadyne webbing"
+	icon = 'modular_nova/master_files/icons/obj/clothing/belts.dmi'
+	worn_icon = 'modular_nova/master_files/icons/mob/clothing/belt.dmi'
+	icon_state = "armadyne_webbing"
+	worn_icon_state = "armadyne_webbing"
+
 /datum/outfit/armadyne_rep
 	name = "Armadyne Corporate Representative"
 
@@ -102,7 +100,7 @@
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses/peacekeeper/armadyne
 	suit = /obj/item/clothing/suit/armor/vest/peacekeeper/armadyne
 	shoes = /obj/item/clothing/shoes/jackboots/peacekeeper/armadyne
-	belt = /obj/item/storage/belt/security/peacekeeper/armadyne
+	belt = /obj/item/storage/belt/security/armadyne
 	r_pocket = /obj/item/assembly/flash/handheld
 	backpack_contents = list(
 		/obj/item/melee/baton/telescopic,
@@ -149,7 +147,7 @@
 	suit = /obj/item/clothing/suit/armor/vest/peacekeeper/armadyne/armor
 	suit_store = /obj/item/gun/ballistic/automatic/sol_rifle
 	shoes = /obj/item/clothing/shoes/jackboots/peacekeeper/armadyne
-	belt = /obj/item/storage/belt/security/webbing/peacekeeper/armadyne
+	belt = /obj/item/storage/belt/security/webbing/armadyne
 	backpack_contents = list(
 		/obj/item/storage/toolbox/guncase/nova/pistol/trappiste_small_case/wespe,
 		/obj/item/storage/box/handcuffs,
@@ -164,7 +162,7 @@
 
 /datum/outfit/armadyne_security/high_alert
 	name = "Armadyne Corporate Security (High Alert)"
-	belt = /obj/item/storage/belt/security/webbing/peacekeeper/armadyne
+	belt = /obj/item/storage/belt/security/webbing/armadyne
 	suit_store = /obj/item/gun/ballistic/automatic/sol_rifle
 	backpack_contents = list(
 		/obj/item/melee/baton/telescopic,

diff --git a/modular_nova/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm b/modular_nova/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm
@@ -177,84 +177,13 @@
 	worn_icon = 'modular_nova/master_files/icons/mob/clothing/hands.dmi'
 	icon_state = "peacekeeper_gripper_gloves"
 
-//PEACEKEEPER BELTS
-/obj/item/storage/belt/security/peacekeeper
-	name = "peacekeeper belt"
-	desc = "This belt can hold security gear like handcuffs and flashes. It has a holster for a gun."
-	icon = 'modular_nova/master_files/icons/obj/clothing/belts.dmi'
-	worn_icon = 'modular_nova/master_files/icons/mob/clothing/belt.dmi'
-	icon_state = "peacekeeperbelt"
-	worn_icon_state = "peacekeeperbelt"
-	content_overlays = FALSE
-
-/obj/item/storage/belt/security/peacekeeper/Initialize(mapload)
-	. = ..()
-	atom_storage.max_slots = 5
-	atom_storage.set_holdable(list(
-		/obj/item/gun/ballistic/automatic/pistol,
-		/obj/item/gun/ballistic/revolver,
-		/obj/item/gun/energy/disabler,
-		/obj/item/melee/baton,
-		/obj/item/melee/baton,
-		/obj/item/grenade,
-		/obj/item/reagent_containers/spray/pepper,
-		/obj/item/restraints/handcuffs,
-		/obj/item/assembly/flash/handheld,
-		/obj/item/clothing/glasses,
-		/obj/item/ammo_casing/shotgun,
-		/obj/item/ammo_box,
-		/obj/item/food/donut,
-		/obj/item/knife/combat,
-		/obj/item/flashlight/seclite,
-		/obj/item/melee/baton/telescopic,
-		/obj/item/radio,
-		/obj/item/clothing/gloves,
-		/obj/item/restraints/legcuffs/bola,
-		/obj/item/holosign_creator/security
-		))
-
-/obj/item/storage/belt/security/peacekeeper/full/PopulateContents()
-	new /obj/item/reagent_containers/spray/pepper(src)
-	new /obj/item/restraints/handcuffs(src)
-	new /obj/item/grenade/flashbang(src)
-	new /obj/item/assembly/flash/handheld(src)
-	update_icon()
-
+//PEACEKEEPER WEBBING
 /obj/item/storage/belt/security/webbing/peacekeeper
 	name = "peacekeeper webbing"
-	desc = "A tactical chest rig issued to peacekeepers; slow is smooth, smooth is fast. Has a notable lack of a holster that fits energy-based weapons."
 	icon = 'modular_nova/master_files/icons/obj/clothing/belts.dmi'
 	worn_icon = 'modular_nova/master_files/icons/mob/clothing/belt.dmi'
 	icon_state = "peacekeeper_webbing"
 	worn_icon_state = "peacekeeper_webbing"
-	content_overlays = FALSE
-	custom_premium_price = PAYCHECK_CREW * 3
-
-/obj/item/storage/belt/security/webbing/peacekeeper/Initialize(mapload)
-	. = ..()
-	atom_storage.max_slots = 7
-	atom_storage.set_holdable(list(
-		/obj/item/gun/ballistic/automatic/pistol,
-		/obj/item/gun/ballistic/revolver,
-		/obj/item/melee/baton,
-		/obj/item/melee/baton,
-		/obj/item/grenade,
-		/obj/item/reagent_containers/spray/pepper,
-		/obj/item/restraints/handcuffs,
-		/obj/item/assembly/flash/handheld,
-		/obj/item/clothing/glasses,
-		/obj/item/ammo_casing/shotgun,
-		/obj/item/ammo_box,
-		/obj/item/food/donut,
-		/obj/item/knife/combat,
-		/obj/item/flashlight/seclite,
-		/obj/item/melee/baton/telescopic,
-		/obj/item/radio,
-		/obj/item/clothing/gloves,
-		/obj/item/restraints/legcuffs/bola,
-		/obj/item/holosign_creator/security
-		))
-
 
 //BOOTS
 /obj/item/clothing/shoes/jackboots/peacekeeper