diff --git a/modular_citadel/code/modules/client/loadout/_donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm similarity index 100% rename from modular_citadel/code/modules/client/loadout/_donator.dm rename to modular_citadel/code/modules/client/loadout/__donator.dm diff --git a/modular_citadel/code/modules/client/loadout/_medical.dm b/modular_citadel/code/modules/client/loadout/_medical.dm new file mode 100644 index 0000000000..e8c8ea453d --- /dev/null +++ b/modular_citadel/code/modules/client/loadout/_medical.dm @@ -0,0 +1,5 @@ +/datum/gear/stethoscope + name = "Stethoscope" + category = slot_neck + path = /obj/item/clothing/neck/stethoscope + restricted_roles = list("Medical Doctor", "Chief Medical Officer") diff --git a/modular_citadel/code/modules/client/loadout/_security.dm b/modular_citadel/code/modules/client/loadout/_security.dm new file mode 100644 index 0000000000..304e99f311 --- /dev/null +++ b/modular_citadel/code/modules/client/loadout/_security.dm @@ -0,0 +1,71 @@ +/datum/gear/navyblueuniformhos + name = "Head of Security navyblue uniform" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/head_of_security/navyblue + restricted_roles = list("Head of Security") + +/datum/gear/navybluehosberet + name = "Head of security's Naviblue beret" + category = slot_head + path = /obj/item/clothing/head/beret/sec/navyhos + restricted_roles = list("Head of Security") + +/datum/gear/navybluejackethos + name = "head of security's navyblue jacket" + category = slot_wear_suit + path = /obj/item/clothing/suit/security/hos + restricted_roles = list("Head of Security") + +/datum/gear/navybluejacketofficer + name = "security officer's navyblue jacket" + category = slot_wear_suit + path = /obj/item/clothing/suit/security/officer + restricted_roles = list("Security Officer") + +/datum/gear/navyblueofficerberet + name = "Security officer's Navyblue beret" + category = slot_head + path = /obj/item/clothing/head/beret/sec/navyofficer + restricted_roles = list("Security Officer") + +/datum/gear/navyblueuniformofficer + name = "security officer navyblue uniform" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/security/navyblue + restricted_roles = list("Security officer") + +/datum/gear/navybluejacketwarden + name = "warden navyblue jacket" + category = slot_wear_suit + path = /obj/item/clothing/suit/security/warden + restricted_roles = list("Warden") + +/datum/gear/navybluewardenberet + name = "Warden's navyblue beret" + category = slot_head + path = /obj/item/clothing/head/beret/sec/navywarden + restricted_roles = list("Warden") + +/datum/gear/navyblueuniformwarden + name = "Warden navyblue uniform" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/warden/navyblue + restricted_roles = list("Warden") + +/datum/gear/secskirt + name = "Security skirt" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/security/skirt + restricted_roles = list("Security Officer", "Warden", "Head of Security") + +/datum/gear/hosskirt + name = "Head of security's skirt" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/head_of_security/skirt + restricted_roles = list("Head of Security") + +/datum/gear/sechud + name = "Security Hud" + category = slot_glasses + path = /obj/item/clothing/glasses/hud/security + restricted_roles = list("Security Officer", "Warden", "Head of Security") \ No newline at end of file diff --git a/modular_citadel/code/modules/client/loadout/_service.dm b/modular_citadel/code/modules/client/loadout/_service.dm new file mode 100644 index 0000000000..56345e9185 --- /dev/null +++ b/modular_citadel/code/modules/client/loadout/_service.dm @@ -0,0 +1,13 @@ +/datum/gear/plushvar + name = "Ratvar Plushie" + category = slot_in_backpack + path = /obj/item/toy/plush/plushvar + cost = 5 + restricted_roles = list("Chaplain") + +/datum/gear/narplush + name = "Narsie Plushie" + category = slot_in_backpack + path = /obj/item/toy/plush/narplush + cost = 5 + restricted_roles = list("Chaplain") \ No newline at end of file diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index 1e3de1b4dd..2779d6f124 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -18,20 +18,6 @@ category = slot_in_backpack path = /obj/item/toy/plush/slimeplushie -/datum/gear/plushvar - name = "Ratvar Plushie" - category = slot_in_backpack - path = /obj/item/toy/plush/plushvar - cost = 5 - restricted_roles = list("Chaplain") - -/datum/gear/narplush - name = "Narsie Plushie" - category = slot_in_backpack - path = /obj/item/toy/plush/narplush - cost = 5 - restricted_roles = list("Chaplain") - /datum/gear/dildo name = "Customizable dildo" category = slot_in_backpack diff --git a/modular_citadel/code/modules/client/loadout/glasses.dm b/modular_citadel/code/modules/client/loadout/glasses.dm index 23e9d5527b..b1e6068a9e 100644 --- a/modular_citadel/code/modules/client/loadout/glasses.dm +++ b/modular_citadel/code/modules/client/loadout/glasses.dm @@ -42,9 +42,3 @@ name = "Prescription glasses" category = slot_glasses path = /obj/item/clothing/glasses/regular - -/datum/gear/sechud - name = "Security Hud" - category = slot_glasses - path = /obj/item/clothing/glasses/hud/security - restricted_roles = list("Security Officer", "Warden", "Head of Security") diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index 1615e37625..5068b9e298 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -47,21 +47,3 @@ name = "Top Hat" category = slot_head path = /obj/item/clothing/head/that - -/datum/gear/navybluehosberet - name = "Head of security's Naviblue beret" - category = slot_head - path = /obj/item/clothing/head/beret/sec/navyhos - restricted_roles = list("Head of Security") - -/datum/gear/navyblueofficerberet - name = "Security officer's Navyblue beret" - category = slot_head - path = /obj/item/clothing/head/beret/sec/navyofficer - restricted_roles = list("Security Officer") - -/datum/gear/navybluewardenberet - name = "Warden's navyblue beret" - category = slot_head - path = /obj/item/clothing/head/beret/sec/navywarden - restricted_roles = list("Warden") diff --git a/modular_citadel/code/modules/client/loadout/neck.dm b/modular_citadel/code/modules/client/loadout/neck.dm index 067d5926eb..5e1e0017fe 100644 --- a/modular_citadel/code/modules/client/loadout/neck.dm +++ b/modular_citadel/code/modules/client/loadout/neck.dm @@ -18,12 +18,6 @@ category = slot_neck path = /obj/item/clothing/neck/petcollar -/datum/gear/stethoscope - name = "Stethoscope" - category = slot_neck - path = /obj/item/clothing/neck/stethoscope - restricted_roles = list("Medical Doctor", "Chief Medical Officer") - /datum/gear/scarf name = "White scarf" category = slot_neck diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index 7e08dce8bd..3c18bef566 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -67,21 +67,3 @@ name = "Ian Shirt" category = slot_wear_suit path = /obj/item/clothing/suit/ianshirt - -/datum/gear/navybluejackethos - name = "head of security's navyblue jacket" - category = slot_wear_suit - path = /obj/item/clothing/suit/security/hos - restricted_roles = list("Head of Security") - -/datum/gear/navybluejacketwarden - name = "warden navyblue jacket" - category = slot_wear_suit - path = /obj/item/clothing/suit/security/warden - restricted_roles = list("Warden") - -/datum/gear/navybluejacketofficer - name = "security officer's navyblue jacket" - category = slot_wear_suit - path = /obj/item/clothing/suit/security/officer - restricted_roles = list("Security Officer") \ No newline at end of file diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 66d96ad910..1487166e13 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -78,25 +78,6 @@ category = slot_w_uniform path = /obj/item/clothing/under/kilt - -/datum/gear/navyblueuniformhos - name = "Head of Security navyblue uniform" - category = slot_w_uniform - path = /obj/item/clothing/under/rank/head_of_security/navyblue - restricted_roles = list("Head of Security") - -/datum/gear/navyblueuniformwarden - name = "Warden navyblue uniform" - category = slot_w_uniform - path = /obj/item/clothing/under/rank/warden/navyblue - restricted_roles = list("Warden") - -/datum/gear/navyblueuniformofficer - name = "security officer navyblue uniform" - category = slot_w_uniform - path = /obj/item/clothing/under/rank/security/navyblue - restricted_roles = list("Security officer") - /datum/gear/camoshorts name = "Camo Pants" category = slot_w_uniform @@ -137,20 +118,7 @@ category = slot_w_uniform path = /obj/item/clothing/under/pants/track -/datum/gear/secskirt - name = "Security skirt" - category = slot_w_uniform - path = /obj/item/clothing/under/rank/security/skirt - restricted_roles = list("Security Officer", "Warden", "Head of Security") - -/datum/gear/hosskirt - name = "Head of security's skirt" - category = slot_w_uniform - path = /obj/item/clothing/under/rank/head_of_security/skirt - restricted_roles = list("Head of Security") - /datum/gear/turtleneck name = "Tactitool Turtleneck" category = slot_w_uniform path = /obj/item/clothing/under/syndicate/cosmetic - diff --git a/tgstation.dme b/tgstation.dme index f655c5d658..5e25b47773 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2534,7 +2534,10 @@ #include "modular_citadel\code\modules\client\client_procs.dm" #include "modular_citadel\code\modules\client\preferences.dm" #include "modular_citadel\code\modules\client\preferences_savefile.dm" -#include "modular_citadel\code\modules\client\loadout\_donator.dm" +#include "modular_citadel\code\modules\client\loadout\__donator.dm" +#include "modular_citadel\code\modules\client\loadout\_medical.dm" +#include "modular_citadel\code\modules\client\loadout\_security.dm" +#include "modular_citadel\code\modules\client\loadout\_service.dm" #include "modular_citadel\code\modules\client\loadout\backpack.dm" #include "modular_citadel\code\modules\client\loadout\glasses.dm" #include "modular_citadel\code\modules\client\loadout\gloves.dm"