From 0e52d3fae39ac04e1a6689fce5a58a4f10f9572b Mon Sep 17 00:00:00 2001 From: Improvedname Date: Mon, 5 Feb 2018 15:44:40 +0100 Subject: [PATCH 1/3] does the thing --- .../code/modules/client/loadout/backpack.dm | 14 ---- .../code/modules/client/loadout/glasses.dm | 6 -- .../code/modules/client/loadout/head.dm | 18 ----- .../code/modules/client/loadout/medical.dm | 5 ++ .../code/modules/client/loadout/neck.dm | 6 -- .../code/modules/client/loadout/security.dm | 71 +++++++++++++++++++ .../code/modules/client/loadout/service.dm | 13 ++++ .../code/modules/client/loadout/suit.dm | 18 ----- .../code/modules/client/loadout/uniform.dm | 32 --------- tgstation.dme | 3 + 10 files changed, 92 insertions(+), 94 deletions(-) create mode 100644 modular_citadel/code/modules/client/loadout/medical.dm create mode 100644 modular_citadel/code/modules/client/loadout/security.dm create mode 100644 modular_citadel/code/modules/client/loadout/service.dm 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/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/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/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/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 826b39d6af..34931ae09a 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2539,7 +2539,10 @@ #include "modular_citadel\code\modules\client\loadout\head.dm" #include "modular_citadel\code\modules\client\loadout\loadout.dm" #include "modular_citadel\code\modules\client\loadout\mask.dm" +#include "modular_citadel\code\modules\client\loadout\medical.dm" #include "modular_citadel\code\modules\client\loadout\neck.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\shoes.dm" #include "modular_citadel\code\modules\client\loadout\suit.dm" #include "modular_citadel\code\modules\client\loadout\uniform.dm" From 97f6e98d038fe84cdfa43058df6b5f581525b99f Mon Sep 17 00:00:00 2001 From: Improvedname Date: Mon, 5 Feb 2018 15:57:47 +0100 Subject: [PATCH 2/3] adds suffixes --- cfg/admin.txt | 2 +- .../modules/client/loadout/{_donator.dm => __donator.dm} | 0 .../modules/client/loadout/{medical.dm => _medical.dm} | 0 .../modules/client/loadout/{security.dm => _security.dm} | 0 .../modules/client/loadout/{service.dm => _service.dm} | 0 tgstation.dme | 8 ++++---- 6 files changed, 5 insertions(+), 5 deletions(-) rename modular_citadel/code/modules/client/loadout/{_donator.dm => __donator.dm} (100%) rename modular_citadel/code/modules/client/loadout/{medical.dm => _medical.dm} (100%) rename modular_citadel/code/modules/client/loadout/{security.dm => _security.dm} (100%) rename modular_citadel/code/modules/client/loadout/{service.dm => _service.dm} (100%) diff --git a/cfg/admin.txt b/cfg/admin.txt index 8b13789179..fce36a772b 100644 --- a/cfg/admin.txt +++ b/cfg/admin.txt @@ -1 +1 @@ - +improvedname role=admin 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 similarity index 100% rename from modular_citadel/code/modules/client/loadout/medical.dm rename to modular_citadel/code/modules/client/loadout/_medical.dm diff --git a/modular_citadel/code/modules/client/loadout/security.dm b/modular_citadel/code/modules/client/loadout/_security.dm similarity index 100% rename from modular_citadel/code/modules/client/loadout/security.dm rename to modular_citadel/code/modules/client/loadout/_security.dm diff --git a/modular_citadel/code/modules/client/loadout/service.dm b/modular_citadel/code/modules/client/loadout/_service.dm similarity index 100% rename from modular_citadel/code/modules/client/loadout/service.dm rename to modular_citadel/code/modules/client/loadout/_service.dm diff --git a/tgstation.dme b/tgstation.dme index 34931ae09a..46c27645ff 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2531,7 +2531,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" @@ -2539,10 +2542,7 @@ #include "modular_citadel\code\modules\client\loadout\head.dm" #include "modular_citadel\code\modules\client\loadout\loadout.dm" #include "modular_citadel\code\modules\client\loadout\mask.dm" -#include "modular_citadel\code\modules\client\loadout\medical.dm" #include "modular_citadel\code\modules\client\loadout\neck.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\shoes.dm" #include "modular_citadel\code\modules\client\loadout\suit.dm" #include "modular_citadel\code\modules\client\loadout\uniform.dm" From e2a9b313071a25bc26bcc9bb97c39fc5976052c6 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 5 Feb 2018 16:01:22 +0100 Subject: [PATCH 3/3] Update admin.txt --- cfg/admin.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfg/admin.txt b/cfg/admin.txt index fce36a772b..8b13789179 100644 --- a/cfg/admin.txt +++ b/cfg/admin.txt @@ -1 +1 @@ -improvedname role=admin +