diff --git a/modular_skyrat/modules/sec_haul/code/peacekeeper/armadyne_clothing.dm b/modular_skyrat/modules/sec_haul/code/peacekeeper/armadyne_clothing.dm index de35907f410..97b7ef36058 100644 --- a/modular_skyrat/modules/sec_haul/code/peacekeeper/armadyne_clothing.dm +++ b/modular_skyrat/modules/sec_haul/code/peacekeeper/armadyne_clothing.dm @@ -78,15 +78,6 @@ 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_skyrat/master_files/icons/obj/clothing/belts.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/belt.dmi' - icon_state = "armadyne_webbing" - worn_icon_state = "armadyne_webbing" - /obj/item/storage/belt/security/peacekeeper/armadyne name = "armadyne belt" desc = "Can hold security gear like handcuffs and flashes. Has a holster for a gun." @@ -154,7 +145,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 backpack_contents = list( /obj/item/storage/box/handcuffs, /obj/item/ammo_box/magazine/c40sol_rifle/standard, @@ -165,10 +156,9 @@ l_pocket = /obj/item/megaphone/command id = /obj/item/card/id/advanced/armadyne/security - /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 suit_store = /obj/item/gun/ballistic/automatic/sol_rifle backpack_contents = list( /obj/item/melee/baton/telescopic, @@ -176,7 +166,6 @@ /obj/item/ammo_box/magazine/c40sol_rifle/standard = 2, ) - /datum/outfit/armadyne_security/commander/high_alert name = "Armadyne Corporate Security Commander (High Alert)" suit_store = /obj/item/gun/ballistic/automatic/sol_rifle diff --git a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm index 8a4072be5f8..bdc6b3988dd 100644 --- a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm +++ b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm @@ -220,40 +220,6 @@ new /obj/item/assembly/flash/handheld(src) update_icon() -/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_skyrat/master_files/icons/obj/clothing/belts.dmi' - worn_icon = 'modular_skyrat/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/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 name = "peacekeeper boots" diff --git a/modular_zubbers/code/_globalvars/lists/maintenance_loot_common.dm b/modular_zubbers/code/_globalvars/lists/maintenance_loot_common.dm index c2f0f3034b3..a71f61dbc62 100644 --- a/modular_zubbers/code/_globalvars/lists/maintenance_loot_common.dm +++ b/modular_zubbers/code/_globalvars/lists/maintenance_loot_common.dm @@ -60,7 +60,6 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/storage/belt/security/peacekeeper = 1, /obj/item/storage/belt/security/redsec = 1, /obj/item/storage/belt/security/webbing = 1, - /obj/item/storage/belt/security/webbing/peacekeeper = 1, /obj/item/storage/belt/utility = 200, /obj/item/storage/belt/utility/full = 25, /obj/item/storage/belt/utility/syndicate = 1, diff --git a/modular_zubbers/code/modules/security/sec_clothing_overrides.dm b/modular_zubbers/code/modules/security/sec_clothing_overrides.dm index 9a6b1ee20b9..96a51b7d239 100644 --- a/modular_zubbers/code/modules/security/sec_clothing_overrides.dm +++ b/modular_zubbers/code/modules/security/sec_clothing_overrides.dm @@ -205,22 +205,6 @@ new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/belt.dmi' new_icon_state = "peacekeeper_webbing" -/obj/item/storage/belt/security/webbing/peacekeeper //did I mention this codebase is fucking awful - -/obj/item/storage/belt/security/webbing/peacekeeper/Initialize(mapload) - . = ..() - var/list/reskin_components = GetComponents(/datum/component/reskinable_item) - for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components) - qdel(reskin_component) - -/obj/item/storage/belt/security/webbing/peacekeeper/armadyne //You two only exist because I don't want to purge you, because it'd break some stuff. Thin fucking ice. - -/obj/item/storage/belt/security/webbing/peacekeeper/armadyne/Initialize(mapload) - . = ..() - var/list/reskin_components = GetComponents(/datum/component/reskinable_item) - for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components) - qdel(reskin_component) - ///Enables you to quickdraw weapons from security holsters /datum/storage/security/open_storage(datum/source, mob/user) var/atom/resolve_parent = parent diff --git a/modular_zubbers/code/modules/vending/armadyne.dm b/modular_zubbers/code/modules/vending/armadyne.dm index 2e99b3a3808..060cb63242d 100644 --- a/modular_zubbers/code/modules/vending/armadyne.dm +++ b/modular_zubbers/code/modules/vending/armadyne.dm @@ -3,10 +3,6 @@ /obj/item/storage/barricade = 4, /obj/item/storage/pouch/ammo = 2, ) - zubbers_premium = list( - /obj/item/storage/belt/security/peacekeeper/armadyne = 3, - /obj/item/storage/belt/security/webbing/peacekeeper/armadyne = 3, - ) zubbers_contraband = list( /obj/item/clothing/neck/kink_collar/locked/gps = 3, )