diff --git a/code/game/objects/effects/spawners/random/traders/trader_organization_spawners.dm b/code/game/objects/effects/spawners/random/traders/trader_organization_spawners.dm index 5a0636829c4..37ffb074f5c 100644 --- a/code/game/objects/effects/spawners/random/traders/trader_organization_spawners.dm +++ b/code/game/objects/effects/spawners/random/traders/trader_organization_spawners.dm @@ -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 diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index d3a5f3d7f18..516c9f31907 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -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." diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index 909a2f22a29..0e34c8a1d89 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index 18b2cabe3d5..336c85dedd7 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/paradise.dme b/paradise.dme index fd22921c30d..760ff4f5c62 100644 --- a/paradise.dme +++ b/paradise.dme @@ -454,8 +454,8 @@ #include "code\datums\components\footstep.dm" #include "code\datums\components\forces_doors_open.dm" #include "code\datums\components\fullauto.dm" -#include "code\datums\components\jetpack_component.dm" #include "code\datums\components\ghost_direct_control.dm" +#include "code\datums\components\jetpack_component.dm" #include "code\datums\components\label.dm" #include "code\datums\components\largeobjecttransparency.dm" #include "code\datums\components\material_container.dm" @@ -1533,8 +1533,8 @@ #include "code\modules\antagonists\_common\antag_hud.dm" #include "code\modules\antagonists\_common\antag_spawner.dm" #include "code\modules\antagonists\_common\antag_team.dm" -#include "code\modules\antagonists\abductor\team_abductor.dm" #include "code\modules\antagonists\abductor\datum_abductor.dm" +#include "code\modules\antagonists\abductor\team_abductor.dm" #include "code\modules\antagonists\antag_org\antag_org_datum.dm" #include "code\modules\antagonists\antag_org\antag_org_syndicate.dm" #include "code\modules\antagonists\changeling\changeling_power.dm"