cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

[FEAT] Adds Federation combat webbing (#28085)

Browse Source 
* the webbening

* Update code/game/objects/items/weapons/storage/belt.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update trader_organization_spawners.dm

* Update code/game/objects/items/weapons/storage/belt.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/belt.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
This commit is contained in:
PopeDaveThe3th
2025-02-02 16:35:37 +00:00
committed by GitHub
co-authored by Contrabang CRUNCH
parent 6088ad3870
commit 94c46040ea
5 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spawners/random/traders/trader_organization_spawners.dm
+1 -1
View File
@@ -7,7 +7,7 @@
/obj/item/clothing/suit/armor/bulletproof = 5,
/obj/item/clothing/mask/gas/explorer/marines = 5,
/obj/item/clothing/gloves/combat = 5,
/obj/item/storage/belt/military/assault = 5,
/obj/item/storage/belt/federation_webbing = 5,
/obj/item/clothing/under/solgov = 5,
/obj/item/mod/module/dispenser = 5,
/obj/item/flag/solgov = 3
code/game/objects/items/weapons/storage/belt.dm
+24
View File
@@ -368,6 +368,30 @@
use_item_overlays = FALSE
layer_over_suit = TRUE
/obj/item/storage/belt/federation_webbing
name = "\improper Federation combat webbing"
desc = "A tactical chest rig used by soldiers and marines of the Trans-Solar Federation. It's covered in pouches and attachment points."
icon_state = "federationwebbing"
item_state = "federationwebbing"
storage_slots = 15
max_combined_w_class = 25
use_item_overlays = FALSE
layer_over_suit = TRUE
w_class_override = list(
/obj/item/crowbar,
/obj/item/screwdriver,
/obj/item/weldingtool,
/obj/item/wirecutters,
/obj/item/wrench,
/obj/item/multitool,
/obj/item/rcd,
/obj/item/rcd_ammo,
/obj/item/ammo_box,
/obj/item/melee/baton,
/obj/item/melee/classic_baton,
/obj/item/kitchen/knife
)
/obj/item/storage/belt/soulstone
name = "soul stone belt"
desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away."