diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index b687b297..abc75064 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -163,4 +163,44 @@ "/obj/item/device/pda", "/obj/item/device/radio/headset", "/obj/item/weapon/melee" - ) \ No newline at end of file + ) + +/obj/item/weapon/storage/belt/military + name = "military belt" + desc = "A syndicate belt designed to be used by boarding parties. Its style is modeled after the hardsuits they wear." + icon_state = "militarybelt" + item_state = "militarybelt" + storage_slots = 7 + max_w_class = 3 + max_combined_w_class = 21 + can_hold = list( + "/obj/item/weapon/grenade", + "/obj/item/weapon/handcuffs", + "/obj/item/device/flash", + "/obj/item/clothing/glasses", + "/obj/item/ammo_casing/shotgun", + "/obj/item/ammo_magazine", + "/obj/item/weapon/melee/baton", + "/obj/item/device/flashlight", + "/obj/item/device/pda", + "/obj/item/device/radio/headset", + "/obj/item/weapon/melee/energy/sword", + "/obj/item/weapon/shield/energy", + "/obj/item/weapon/pinpointer", + ) + +/obj/item/weapon/storage/belt/janitor + name = "janibelt" + desc = "A belt used to hold most janitorial supplies." + icon_state = "janibelt" + item_state = "janibelt" + storage_slots = 6 + max_w_class = 4 // Set to this so the light replacer can fit. + can_hold = list( + "/obj/item/weapon/grenade/chem_grenade/cleaner", + "/obj/item/device/lightreplacer", + "/obj/item/device/flashlight", + "/obj/item/weapon/reagent_containers/spray", + "/obj/item/weapon/soap", + "/obj/item/weapon/storage/bag/trash" +) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 752bc254..21019765 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -54,6 +54,7 @@ new /obj/item/weapon/caution(src) new /obj/item/device/lightreplacer(src) new /obj/item/weapon/storage/bag/trash(src) + new /obj/item/weapon/storage/belt/janitor(src) new /obj/item/clothing/shoes/galoshes(src) /* diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 58da2b2a..7b8ad6e5 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -104,7 +104,7 @@ else new /obj/item/weapon/storage/backpack/satchel_sec(src) new /obj/item/clothing/head/helmet/HoS(src) - new /obj/item/clothing/suit/armor/vest(src) + new /obj/item/clothing/suit/armor/hos/vest(src) new /obj/item/clothing/under/rank/head_of_security/jensen(src) new /obj/item/clothing/under/rank/head_of_security/corp(src) new /obj/item/clothing/suit/armor/hos/jensen(src) diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index e16b4c36..cc2dc878 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -22,6 +22,7 @@ new /obj/item/weapon/card/id/syndicate(src) new /obj/item/device/multitool(src) new /obj/item/weapon/shield/energy(src) + new /obj/item/weapon/storage/belt/military(src) new /obj/item/clothing/shoes/magboots(src) diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 328b7b58..73bef0cd 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -148,6 +148,14 @@ flags_inv = HIDEJUMPSUIT siemens_coefficient = 0.6 +/obj/item/clothing/suit/armor/hos/vest + name = "armored vest" + desc = "A platecarrier worns by the head of security." + icon_state = "hos-armor" + item_state = "armor" + flags_inv = 0 + siemens_coefficient = 0.6 + /obj/item/clothing/head/helmet/HoS/dermal name = "Dermal Armour Patch" diff --git a/icons/mecha/mech_construct.dmi b/icons/mecha/mech_construct.dmi index c42e458c..2cff5859 100644 Binary files a/icons/mecha/mech_construct.dmi and b/icons/mecha/mech_construct.dmi differ diff --git a/icons/mecha/mech_construction.dmi b/icons/mecha/mech_construction.dmi index 5c817a9e..949b1463 100644 Binary files a/icons/mecha/mech_construction.dmi and b/icons/mecha/mech_construction.dmi differ diff --git a/icons/mecha/mecha.dmi b/icons/mecha/mecha.dmi index 13445166..3a73aed8 100644 Binary files a/icons/mecha/mecha.dmi and b/icons/mecha/mecha.dmi differ diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi index e83c82d6..8d7f7f0c 100644 Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 0719b616..d094c3d0 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index dc1ddc75..7f0ccf7a 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index ca8c78e1..441c7bf2 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 0259bceb..91443b1a 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 9aa12aca..a52adf88 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index fc642552..be021476 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 4aaab331..d2915813 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index d7754f96..96fdadb6 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 64680c2f..56cd95d0 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index a3aa2ab7..fabcd8f4 100644 Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index 47dc4319..8a9793cf 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ