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 a824bbdc3f5..7d001d7755e 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -38,6 +38,7 @@ name = "\proper head of personnel's locker" req_access = list(ACCESS_HOP) icon_state = "hop" + storage_capacity = 40 //SKYRAT EDIT ADDITION /obj/structure/closet/secure_closet/hop/PopulateContents() ..() @@ -49,7 +50,7 @@ new /obj/item/clothing/under/rank/civilian/head_of_personnel/parade(src) //SKYRAT EDIT ADDITION START - HOP PARADE UNIFORMS new /obj/item/clothing/under/rank/civilian/head_of_personnel/parade/female(src) new /obj/item/clothing/suit/armor/hop_parade(src) - new /obj/item/clothing/suit/armor/hop_parade/female(src) //SKYRAT EDIT ADDITION END + new /obj/item/clothing/suit/armor/hop_parade/female(src) //SKYRAT EDIT ADDITION END new /obj/item/cartridge/hop(src) new /obj/item/radio/headset/heads/hop(src) new /obj/item/clothing/shoes/sneakers/brown(src) @@ -67,7 +68,11 @@ new /obj/item/storage/photo_album/hop(src) new /obj/item/storage/lockbox/medal/hop(src) new /obj/item/clothing/suit/hooded/wintercoat/hop(src) - + new /obj/item/clothing/under/rank/civilian/head_of_personnel/turtleneck(src) //SKYRAT EDIT ADDITION START - HOP DRIP + new /obj/item/clothing/under/rank/civilian/head_of_personnel/turtleneck/skirt(src) + new /obj/item/storage/backpack/head_of_personnel(src) + new /obj/item/storage/backpack/satchel/head_of_personnel(src) + new /obj/item/storage/backpack/duffel/head_of_personnel(src) /obj/structure/closet/secure_closet/hos name = "\proper head of security's locker" diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index 70fc7372c35..6d07a46907c 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -62,6 +62,10 @@ chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/hop) + backpack = /obj/item/storage/backpack/head_of_personnel // SKYRAT EDIT CHANGE - HOP DRIP + satchel = /obj/item/storage/backpack/satchel/head_of_personnel // SKYRAT EDIT CHANGE - HOP DRIP + duffelbag = /obj/item/storage/backpack/duffel/head_of_personnel // SKYRAT EDIT CHANGE - HOP DRIP + id_trim = /datum/id_trim/job/head_of_personnel /datum/outfit/job/hop/pre_equip(mob/living/carbon/human/H) diff --git a/modular_skyrat/master_files/icons/mob/clothing/back.dmi b/modular_skyrat/master_files/icons/mob/clothing/back.dmi index 8a07d29cb02..984c68d4cbf 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/back.dmi and b/modular_skyrat/master_files/icons/mob/clothing/back.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi b/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi index edaa14ba801..1ed6ca52b76 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi and b/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi b/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi index 1c07ae0e2b4..82f8abb7c6d 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi and b/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi differ diff --git a/modular_skyrat/modules/hop_drip/code/clothing/under/jobs/civillian.dm b/modular_skyrat/modules/hop_drip/code/clothing/under/jobs/civillian.dm new file mode 100644 index 00000000000..78b13ed0e96 --- /dev/null +++ b/modular_skyrat/modules/hop_drip/code/clothing/under/jobs/civillian.dm @@ -0,0 +1,19 @@ +//HOP +/obj/item/clothing/under/rank/civilian/head_of_personnel/turtleneck + name = "head of personnel's turtleneck" + desc = "A dark teal turtleneck and black khakis, for a second with a superior sense of style." + icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' + icon_state = "hopturtle" + inhand_icon_state = "b_suit" + can_adjust = TRUE + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/civilian/head_of_personnel/turtleneck/skirt + name = "head of personnel's turtleneck skirt" + desc = "A dark teal turtleneck and tanblack khaki skirt, for a second with a superior sense of style." + icon_state = "hopturtle_skirt" + inhand_icon_state = "b_suit" + body_parts_covered = CHEST|GROIN|ARMS + dying_key = DYE_REGISTRY_JUMPSKIRT + fitted = FEMALE_UNIFORM_TOP diff --git a/modular_skyrat/modules/hop_drip/code/storage/backpacks/head_of_personnel.dm b/modular_skyrat/modules/hop_drip/code/storage/backpacks/head_of_personnel.dm new file mode 100644 index 00000000000..f2f9102cf73 --- /dev/null +++ b/modular_skyrat/modules/hop_drip/code/storage/backpacks/head_of_personnel.dm @@ -0,0 +1,39 @@ +/obj/item/storage/backpack/head_of_personnel + name = "head of personnel backpack" + desc = "A exclusive backpack issued to Nanotrasen's finest second." + icon = 'modular_skyrat/modules/hop_drip/icons/storage/hop_packs.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' + lefthand_file = 'modular_skyrat/modules/hop_drip/icons/storage/backpack_lefthand.dmi' + righthand_file = 'modular_skyrat/modules/hop_drip/icons/storage/backpack_righthand.dmi' + icon_state = "hop_pack" + inhand_icon_state = "hop_pack" + +/obj/item/storage/backpack/satchel/head_of_personnel + name = "head of personnel satchel" + desc = "A exclusive satchel issued to Nanotrasen's finest second." + icon = 'modular_skyrat/modules/hop_drip/icons/storage/hop_packs.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' + lefthand_file = 'modular_skyrat/modules/hop_drip/icons/storage/backpack_lefthand.dmi' + righthand_file = 'modular_skyrat/modules/hop_drip/icons/storage/backpack_righthand.dmi' + icon_state = "satchel_hop" + inhand_icon_state = "satchel_hop" + +/obj/item/storage/backpack/duffel/head_of_personnel + name = "head of personnel duffelbag" + desc = "A robust duffelbag issued to Nanotrasen's finest second." + icon = 'modular_skyrat/modules/hop_drip/icons/storage/hop_packs.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' + lefthand_file = 'modular_skyrat/modules/hop_drip/icons/storage/backpack_lefthand.dmi' + righthand_file = 'modular_skyrat/modules/hop_drip/icons/storage/backpack_righthand.dmi' + icon_state = "duffel_hop" + inhand_icon_state = "duffel_hop" + +/obj/item/radio/headset/heads/hop/alt + name = "\proper the head of personnel's bowman headset" + desc = "The headset of the second. Protects ears from flashbangs." + icon_state = "com_headset_alt" + inhand_icon_state = "com_headset_alt" + +/obj/item/radio/headset/heads/hop/alt/ComponentInitialize() + . = ..() + AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) diff --git a/modular_skyrat/modules/hop_drip/icons/storage/backpack_lefthand.dmi b/modular_skyrat/modules/hop_drip/icons/storage/backpack_lefthand.dmi new file mode 100644 index 00000000000..bc51c9a76c9 Binary files /dev/null and b/modular_skyrat/modules/hop_drip/icons/storage/backpack_lefthand.dmi differ diff --git a/modular_skyrat/modules/hop_drip/icons/storage/backpack_righthand.dmi b/modular_skyrat/modules/hop_drip/icons/storage/backpack_righthand.dmi new file mode 100644 index 00000000000..dbf6a67174f Binary files /dev/null and b/modular_skyrat/modules/hop_drip/icons/storage/backpack_righthand.dmi differ diff --git a/modular_skyrat/modules/hop_drip/icons/storage/hop_packs.dmi b/modular_skyrat/modules/hop_drip/icons/storage/hop_packs.dmi new file mode 100644 index 00000000000..bc32c1e25a6 Binary files /dev/null and b/modular_skyrat/modules/hop_drip/icons/storage/hop_packs.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 73947e184eb..fa22ed3e93f 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4349,6 +4349,8 @@ #include "modular_skyrat\modules\holdingfashion_port\code\game\objects\items\storage\backpack.dm" #include "modular_skyrat\modules\holdingfashion_port\code\research\designs\bluespace_design.dm" #include "modular_skyrat\modules\holdingfashion_port\code\research\techweb\bluespace_node.dm" +#include "modular_skyrat\modules\hop_drip\code\clothing\under\jobs\civillian.dm" +#include "modular_skyrat\modules\hop_drip\code\storage\backpacks\head_of_personnel.dm" #include "modular_skyrat\modules\horrorform\code\modules\antagonists\changeling\powers\horror_form.dm" #include "modular_skyrat\modules\horrorform\code\modules\mob\hostile\true_changeling.dm" #include "modular_skyrat\modules\huds\code\designs.dm"