cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 08:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes armadyne webbing (#5113)

Browse Source 
## About The Pull Request
Removes armadyne webbing, and the belt.
## Why It's Good For The Game
The belt is being removed, becuase it's just a secbelt that you can
already reskin into. Why is it needed there at all?

The webbing is an intentional balance change.
https://github.com/Bubberstation/Bubberstation/pull/4800 forgot to move
the blue version into the vendor, but all things considered something
like this shouldn't exist.

In comparison to other sec belts, it gives two more slots, with the
tradeoff of...nothing. The tradeoff it used to have isn't around anymore
because of tg updates. It's just a straight upgrade of a TG item for
half the price.

I say this as a sec main who always takes this item, this item is too
good for what it is, and warrants the axe.
## Proof Of Testing
Works on my machine.
<details>
<summary>Screenshots/Videos</summary>

</details>

## Changelog
🆑
del: Removes the armadyne webbing
/🆑

---------

Co-authored-by: Cato Christopher <184588377+CatoChristopherMrow@users.noreply.github.com>
This commit is contained in:
CatoChristopherMrow
2026-02-07 20:18:56 +02:00
committed by GitHub
co-authored by Cato Christopher
parent 39adcc42c7
commit 76c8aca731
5 changed files with 2 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_skyrat/modules/sec_haul/code/peacekeeper/armadyne_clothing.dm
+2 -13
View File
@@ -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
modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm
-34
View File
@@ -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"
modular_zubbers/code/_globalvars/lists/maintenance_loot_common.dm
-1
View File
@@ -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,
modular_zubbers/code/modules/security/sec_clothing_overrides.dm
-16
View File
@@ -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
modular_zubbers/code/modules/vending/armadyne.dm
-4
View File
@@ -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,
)