diff --git a/modular_citadel/code/modules/client/loadout/_donator.dm b/modular_citadel/code/modules/client/loadout/_donator.dm index d663d572cd..027a04a5fe 100644 --- a/modular_citadel/code/modules/client/loadout/_donator.dm +++ b/modular_citadel/code/modules/client/loadout/_donator.dm @@ -142,6 +142,7 @@ name = "Russian flask" category = slot_in_backpack path = /obj/item/reagent_containers/food/drinks/flask/russian + cost = 2 ckeywhitelist = list("slomka") /datum/gear/stalkermask diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index 2779d6f124..1e3de1b4dd 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -18,6 +18,20 @@ 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 68ba745311..23e9d5527b 100644 --- a/modular_citadel/code/modules/client/loadout/glasses.dm +++ b/modular_citadel/code/modules/client/loadout/glasses.dm @@ -7,17 +7,17 @@ name = "Eyepatch" category = slot_glasses path = /obj/item/clothing/glasses/eyepatch - + /datum/gear/heat name = "Heat goggles" category = slot_glasses path = /obj/item/clothing/glasses/heat - + /datum/gear/hipster name = "Hipster glasses" category = slot_glasses path = /obj/item/clothing/glasses/regular/hipster - + /datum/gear/jamjar name = "Jamjar glasses" category = slot_glasses @@ -33,7 +33,18 @@ category = slot_glasses path = /obj/item/clothing/glasses/orange +/datum/gear/red + name = "Red Glasses" + category = slot_glasses + path = /obj/item/clothing/glasses/red + /datum/gear/prescription 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/gloves.dm b/modular_citadel/code/modules/client/loadout/gloves.dm new file mode 100644 index 0000000000..ec67fbc0ec --- /dev/null +++ b/modular_citadel/code/modules/client/loadout/gloves.dm @@ -0,0 +1,4 @@ +/datum/gear/fingerless + name = "Fingerless Gloves" + category = slot_gloves + path = /obj/item/clothing/gloves/fingerless \ No newline at end of file diff --git a/modular_citadel/code/modules/client/loadout/hands.dm b/modular_citadel/code/modules/client/loadout/hands.dm index cc5e6b8e71..94815a7243 100644 --- a/modular_citadel/code/modules/client/loadout/hands.dm +++ b/modular_citadel/code/modules/client/loadout/hands.dm @@ -47,3 +47,15 @@ name = "Wallet" category = slot_hands path = /obj/item/storage/wallet + +/datum/gear/flask + name = "Flask" + category = slot_hands + path = /obj/item/reagent_containers/food/drinks/flask + cost = 2 + +/datum/gear/zippolighter + name = "Zippo Lighter" + category = slot_hands + path = /obj/item/lighter + cost = 2 diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index 66701903d5..1615e37625 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -1,6 +1,6 @@ /datum/gear/baseball name = "Ballcap" - category = slot_head + category = slot_head path = /obj/item/clothing/head/soft/mime /datum/gear/beanie @@ -37,3 +37,31 @@ name = "Slime hat" category = slot_head path = /obj/item/clothing/head/collectable/slime + +/datum/gear/fedora + name = "Fedora" + category = slot_head + path = /obj/item/clothing/head/fedora + +/datum/gear/that + 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/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index 9e0a3272ab..7e08dce8bd 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -57,3 +57,31 @@ name = "Winter coat" category = slot_wear_suit path = /obj/item/clothing/suit/hooded/wintercoat + +/datum/gear/militaryjacket + name = "Military Jacket" + category = slot_wear_suit + path = /obj/item/clothing/suit/jacket/miljacket + +/datum/gear/ianshirt + 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 f2936572a1..66d96ad910 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -78,6 +78,65 @@ 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 + path = /obj/item/clothing/under/pants/camo + +/datum/gear/bjeans + name = "Black Jeans" + category = slot_w_uniform + path = /obj/item/clothing/under/pants/blackjeans + +/datum/gear/cjeans + name = "Classic Jeans" + category = slot_w_uniform + path = /obj/item/clothing/under/pants/classicjeans + +/datum/gear/khaki + name = "Khaki Pants" + category = slot_w_uniform + path = /obj/item/clothing/under/pants/khaki + +/datum/gear/wpants + name = "White Pants" + category = slot_w_uniform + path = /obj/item/clothing/under/pants/white + +/datum/gear/rpants + name = "Red Pants" + category = slot_w_uniform + path = /obj/item/clothing/under/pants/red + +/datum/gear/tpants + name = "Tan Pants" + category = slot_w_uniform + path = /obj/item/clothing/under/pants/tan + +/datum/gear/trpants + name = "Track Pants" + category = slot_w_uniform + path = /obj/item/clothing/under/pants/track + /datum/gear/secskirt name = "Security skirt" category = slot_w_uniform @@ -89,3 +148,9 @@ 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/modular_citadel/code/modules/clothing/under.dm b/modular_citadel/code/modules/clothing/under.dm new file mode 100644 index 0000000000..bf77704122 --- /dev/null +++ b/modular_citadel/code/modules/clothing/under.dm @@ -0,0 +1,7 @@ +/obj/item/clothing/under/syndicate/cosmetic + name = "tactitool turtleneck" + desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-." + icon_state = "tactifool" + item_state = "bl_suit" + item_color = "tactifool" + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0) \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index ee3f6b853d..81b0971ca1 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2526,6 +2526,7 @@ #include "modular_citadel\code\modules\client\loadout\_donator.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" #include "modular_citadel\code\modules\client\loadout\hands.dm" #include "modular_citadel\code\modules\client\loadout\head.dm" #include "modular_citadel\code\modules\client\loadout\loadout.dm" @@ -2534,6 +2535,7 @@ #include "modular_citadel\code\modules\client\loadout\shoes.dm" #include "modular_citadel\code\modules\client\loadout\suit.dm" #include "modular_citadel\code\modules\client\loadout\uniform.dm" +#include "modular_citadel\code\modules\clothing\under.dm" #include "modular_citadel\code\modules\crafting\recipes.dm" #include "modular_citadel\code\modules\mining\mine_items.dm" #include "modular_citadel\code\modules\mob\living\banana_spider.dm"