From 2bd4aa98ed79cc95bebd63bec9f38dff4cec08ea Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Thu, 22 Mar 2018 13:10:23 -0500 Subject: [PATCH 01/27] y --- code/modules/clothing/suits/cloaks.dm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm index 03f549fbe8..150df373ed 100644 --- a/code/modules/clothing/suits/cloaks.dm +++ b/code/modules/clothing/suits/cloaks.dm @@ -71,6 +71,19 @@ desc = "A protective & concealing hood." armor = list("melee" = 35, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR + +/obj/item/clothing/suit/hooded/cloak/david + name = "red cloak" + icon_state = "goliath_cloak" + desc = "Ever wanted to look like a badass without ANY effort? Try this nanotrasen brand red cloak, perfect for kids" + hoodtype = /obj/item/clothing/head/hooded/cloakhood/david + body_parts_covered = CHEST|GROIN|ARMS + +/obj/item/clothing/head/hooded/cloakhood/david + name = "red cloak hood" + icon_state = "golhood" + desc = "conceal your face in shame with this nanotrasen brand hood" + flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR /obj/item/clothing/suit/hooded/cloak/drake name = "drake armour" From 5eee3d6adaf154ff730b356e9e92485e15e9da32 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Thu, 22 Mar 2018 13:22:24 -0500 Subject: [PATCH 02/27] added --- modular_citadel/code/modules/client/loadout/suit.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index 941da5c29f..85d5b5cbd0 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -13,6 +13,12 @@ category = slot_wear_suit path = /obj/item/clothing/suit/poncho/red +/datum/gear/redhood + name = "Red cloak" + category = slot_wear_suit + path = /obj/item/clothing/suit/hooded/cloak/david + cost = 3 + /datum/gear/jacketbomber name = "Bomber jacket" category = slot_wear_suit @@ -99,4 +105,4 @@ name = "fed (movie) uniform, ops/eng" category = slot_wear_suit path = /obj/item/clothing/suit/storage/fluff/fedcoat/eng - restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Cargo Technician", "Shaft Miner", "Quartermaster") \ No newline at end of file + restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Cargo Technician", "Shaft Miner", "Quartermaster") From 5c5e336919058759f39290907bf6624325c6e947 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Thu, 22 Mar 2018 14:27:49 -0500 Subject: [PATCH 03/27] THOTS --- .../code/modules/client/loadout/uniform.dm | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index acb2b4e13c..727f8075cf 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -1,3 +1,21 @@ +/datum/gear/scrubsblue + name = "Blue scrubs" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/medical/blue + restricted_roles = list("Medical Doctor", "Chief Medical Officer") + +/datum/gear/scrubsgreen + name = "Green scrubs" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/medical/green + restricted_roles = list("Medical Doctor", "Chief Medical Officer") + +/datum/gear/scrubspurple + name = "Purple scrubs" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/medical/purple + restricted_roles = list("Medical Doctor", "Chief Medical Officer") + /datum/gear/suitblack name = "Black suit" category = slot_w_uniform @@ -122,6 +140,17 @@ name = "Tactitool Turtleneck" category = slot_w_uniform path = /obj/item/clothing/under/syndicate/cosmetic +/datum/gear/strppink + name = "Pink stripper outfit" + category = slot_w_uniform + path = /obj/item/clothing/under/stripper_pink + cost = 8 //thots pay the thot toll + +/datum/gear/strpgreen + name = "Green stripper outfit" + category = slot_w_uniform + path = /obj/item/clothing/under/stripper_green + cost = 8 // Trekie things //TOS From d4a4c7b0bff1ce5fd2ca6932023ffbacb62d4ba3 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Thu, 22 Mar 2018 14:28:20 -0500 Subject: [PATCH 04/27] Update uniform.dm --- modular_citadel/code/modules/client/loadout/uniform.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 727f8075cf..62e0615ccd 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -140,6 +140,7 @@ name = "Tactitool Turtleneck" category = slot_w_uniform path = /obj/item/clothing/under/syndicate/cosmetic + /datum/gear/strppink name = "Pink stripper outfit" category = slot_w_uniform From fe39a5a550530314a483fa58dfe121e8e6e7120b Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Thu, 22 Mar 2018 23:28:33 -0500 Subject: [PATCH 06/27] MOVED TO HERE --- .../code/modules/clothing/suits/suits.dm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/clothing/suits/suits.dm b/modular_citadel/code/modules/clothing/suits/suits.dm index 8c88a7e193..60b951bdb4 100644 --- a/modular_citadel/code/modules/clothing/suits/suits.dm +++ b/modular_citadel/code/modules/clothing/suits/suits.dm @@ -10,4 +10,17 @@ desc = "A trenchcoat enchanced with a special lightweight kevlar. This one appears to be designed to be draped over one's shoulders rather than worn normally.." alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' icon_state = "hostrench" - item_state = "hostrench" \ No newline at end of file + item_state = "hostrench" + +/obj/item/clothing/suit/hooded/cloak/david + name = "red cloak" + icon_state = "goliath_cloak" + desc = "Ever wanted to look like a badass without ANY effort? Try this nanotrasen brand red cloak, perfect for kids" + hoodtype = /obj/item/clothing/head/hooded/cloakhood/david + body_parts_covered = CHEST|GROIN|ARMS + +/obj/item/clothing/head/hooded/cloakhood/david + name = "red cloak hood" + icon_state = "golhood" + desc = "conceal your face in shame with this nanotrasen brand hood" + flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR From 6f87d24289fe8e57aecdc2c586b41d02928edc60 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Thu, 22 Mar 2018 23:29:17 -0500 Subject: [PATCH 07/27] DELETED FROM HERE --- code/modules/clothing/suits/cloaks.dm | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm index 150df373ed..03f549fbe8 100644 --- a/code/modules/clothing/suits/cloaks.dm +++ b/code/modules/clothing/suits/cloaks.dm @@ -71,19 +71,6 @@ desc = "A protective & concealing hood." armor = list("melee" = 35, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR - -/obj/item/clothing/suit/hooded/cloak/david - name = "red cloak" - icon_state = "goliath_cloak" - desc = "Ever wanted to look like a badass without ANY effort? Try this nanotrasen brand red cloak, perfect for kids" - hoodtype = /obj/item/clothing/head/hooded/cloakhood/david - body_parts_covered = CHEST|GROIN|ARMS - -/obj/item/clothing/head/hooded/cloakhood/david - name = "red cloak hood" - icon_state = "golhood" - desc = "conceal your face in shame with this nanotrasen brand hood" - flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR /obj/item/clothing/suit/hooded/cloak/drake name = "drake armour" From e7ffc961bc4436872717c55efa193cb6ff75a8b4 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Thu, 22 Mar 2018 23:39:11 -0500 Subject: [PATCH 08/27] polychromic nerds --- .../code/modules/client/loadout/uniform.dm | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 62e0615ccd..e0566aa854 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -152,7 +152,29 @@ category = slot_w_uniform path = /obj/item/clothing/under/stripper_green cost = 8 +/datum/gear/sundress + name = "Sundress" + category = slot_w_uniform + path = /obj/item/clothing/under/sundress +/datum/gear/polyjumpsuit + name = "Polychromic jumpsuit" + category = slot_w_uniform + path = /obj/item/clothing/under/polychromic/jumpsuit + cost = 3 + +/datum/gear/polyskirt + name = "Polychromic SKIRT" + category = slot_w_uniform + path = /obj/item/clothing/under/polychromic/skirt + cost = 3 + +/datum/gear/polyshirt + name = "Polychromic SHIRT" //so people don't misread + category = slot_w_uniform + path = /obj/item/clothing/under/polychromic/shirt + cost = 3 + // Trekie things //TOS /datum/gear/trekcmdtos From 798b10d28b665c5fd00ea21664b570b80121f98f Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Thu, 22 Mar 2018 23:48:58 -0500 Subject: [PATCH 09/27] more gloves --- .../code/modules/client/loadout/gloves.dm | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/client/loadout/gloves.dm b/modular_citadel/code/modules/client/loadout/gloves.dm index ec67fbc0ec..585eb56ace 100644 --- a/modular_citadel/code/modules/client/loadout/gloves.dm +++ b/modular_citadel/code/modules/client/loadout/gloves.dm @@ -1,4 +1,28 @@ /datum/gear/fingerless name = "Fingerless Gloves" category = slot_gloves - path = /obj/item/clothing/gloves/fingerless \ No newline at end of file + path = /obj/item/clothing/gloves/fingerless + +/datum/gear/glovesrainbow + name = "Rainbow gloves" + category = slot_gloves + path = /obj/item/clothing/gloves/color/rainbow + cost = 2 + +/datum/gear/glovesred + name = "Red gloves" + category = slot_gloves + path = /obj/item/clothing/gloves/color/red + cost = 2 + +/datum/gear/glovesblue + name = "Blue gloves" + category = slot_gloves + path = /obj/item/clothing/gloves/color/blue + cost = 2 + +/datum/gear/glovesgray + name = "Gray gloves" + category = slot_gloves + path = /obj/item/clothing/gloves/color/grey + cost = 2 From 8d74f7a7913561b67177211a73c0271a03cbd672 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Thu, 22 Mar 2018 23:54:24 -0500 Subject: [PATCH 10/27] moustache --- modular_citadel/code/modules/client/loadout/mask.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modular_citadel/code/modules/client/loadout/mask.dm b/modular_citadel/code/modules/client/loadout/mask.dm index 839502d99c..5de520a20a 100644 --- a/modular_citadel/code/modules/client/loadout/mask.dm +++ b/modular_citadel/code/modules/client/loadout/mask.dm @@ -2,3 +2,8 @@ name = "Balaclava" category = slot_wear_mask path = /obj/item/clothing/mask/balaclava + +/datum/gear/moustache + name = "Fake moustache" + category = slot_wear_mask + path = /obj/item/clothing/mask/fakemoustache From 3eecb782b940c5ccb1f71420a23ee03b549187fc Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Thu, 22 Mar 2018 23:57:25 -0500 Subject: [PATCH 11/27] COUGH COUGH SMOKING COUGH --- modular_citadel/code/modules/client/loadout/hands.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modular_citadel/code/modules/client/loadout/hands.dm b/modular_citadel/code/modules/client/loadout/hands.dm index 94815a7243..3bb58a8719 100644 --- a/modular_citadel/code/modules/client/loadout/hands.dm +++ b/modular_citadel/code/modules/client/loadout/hands.dm @@ -59,3 +59,9 @@ category = slot_hands path = /obj/item/lighter cost = 2 + +/datum/gear/cigar + name = "Cigar" + category = slot_hands + path = /obj/item/clothing/mask/cigarette/cigar + cost = 4 //smoking is bad mkay From a4d949816bd7774a147329944569e3c5a786726a Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Fri, 30 Mar 2018 13:38:07 -0500 Subject: [PATCH 12/27] increased glove csost --- modular_citadel/code/modules/client/loadout/gloves.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/gloves.dm b/modular_citadel/code/modules/client/loadout/gloves.dm index 585eb56ace..0b0581f0b0 100644 --- a/modular_citadel/code/modules/client/loadout/gloves.dm +++ b/modular_citadel/code/modules/client/loadout/gloves.dm @@ -7,22 +7,22 @@ name = "Rainbow gloves" category = slot_gloves path = /obj/item/clothing/gloves/color/rainbow - cost = 2 + cost = 5 /datum/gear/glovesred name = "Red gloves" category = slot_gloves path = /obj/item/clothing/gloves/color/red - cost = 2 + cost = 5 /datum/gear/glovesblue name = "Blue gloves" category = slot_gloves path = /obj/item/clothing/gloves/color/blue - cost = 2 + cost = 5 /datum/gear/glovesgray name = "Gray gloves" category = slot_gloves path = /obj/item/clothing/gloves/color/grey - cost = 2 + cost = 5 From 2d038f3f94b0cce86b8d59f500f99069482b1027 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Sun, 1 Apr 2018 18:31:26 -0500 Subject: [PATCH 13/27] gay --- .../code/modules/client/loadout/gloves.dm | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/gloves.dm b/modular_citadel/code/modules/client/loadout/gloves.dm index 0b0581f0b0..d504444506 100644 --- a/modular_citadel/code/modules/client/loadout/gloves.dm +++ b/modular_citadel/code/modules/client/loadout/gloves.dm @@ -2,27 +2,3 @@ name = "Fingerless Gloves" category = slot_gloves path = /obj/item/clothing/gloves/fingerless - -/datum/gear/glovesrainbow - name = "Rainbow gloves" - category = slot_gloves - path = /obj/item/clothing/gloves/color/rainbow - cost = 5 - -/datum/gear/glovesred - name = "Red gloves" - category = slot_gloves - path = /obj/item/clothing/gloves/color/red - cost = 5 - -/datum/gear/glovesblue - name = "Blue gloves" - category = slot_gloves - path = /obj/item/clothing/gloves/color/blue - cost = 5 - -/datum/gear/glovesgray - name = "Gray gloves" - category = slot_gloves - path = /obj/item/clothing/gloves/color/grey - cost = 5 From cee51cd79dc420bb0b97c68fa2567d77d9d0c577 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Wed, 4 Apr 2018 12:50:02 -0500 Subject: [PATCH 14/27] should fix conflicts --- .../code/modules/client/loadout/uniform.dm | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index e0566aa854..a4b3e6c49e 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -141,6 +141,7 @@ category = slot_w_uniform path = /obj/item/clothing/under/syndicate/cosmetic +<<<<<<< LOADOUT /datum/gear/strppink name = "Pink stripper outfit" category = slot_w_uniform @@ -175,6 +176,26 @@ path = /obj/item/clothing/under/polychromic/shirt cost = 3 +======= +/datum/gear/polykilt + name = "Polychromic Kilt" + category = slot_w_uniform + path = /obj/item/clothing/under/polychromic/kilt + cost = 3 + +/datum/gear/polyshorts + name = "Polychromic Shorts" + category = slot_w_uniform + path = /obj/item/clothing/under/polychromic/shorts + cost = 3 + +/datum/gear/polyshortpants + name = "Polychromic Athletic Shorts" + category = slot_w_uniform + path = /obj/item/clothing/under/polychromic/shortpants + cost = 2 + +>>>>>>> master // Trekie things //TOS /datum/gear/trekcmdtos From 417fa9e264d88f8eb326e884cdd98db4f73ffa26 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Wed, 4 Apr 2018 12:52:40 -0500 Subject: [PATCH 15/27] yes --- modular_citadel/code/modules/client/loadout/uniform.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index a4b3e6c49e..46e9530b71 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -141,7 +141,6 @@ category = slot_w_uniform path = /obj/item/clothing/under/syndicate/cosmetic -<<<<<<< LOADOUT /datum/gear/strppink name = "Pink stripper outfit" category = slot_w_uniform @@ -176,7 +175,6 @@ path = /obj/item/clothing/under/polychromic/shirt cost = 3 -======= /datum/gear/polykilt name = "Polychromic Kilt" category = slot_w_uniform @@ -195,7 +193,6 @@ path = /obj/item/clothing/under/polychromic/shortpants cost = 2 ->>>>>>> master // Trekie things //TOS /datum/gear/trekcmdtos From a4e3b19891c8ab0677eeb0ae4b1b406ba3da5109 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Wed, 4 Apr 2018 12:55:52 -0500 Subject: [PATCH 16/27] maybe --- .../code/modules/client/loadout/uniform.dm | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 46e9530b71..d06eefbb1a 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -141,7 +141,24 @@ category = slot_w_uniform path = /obj/item/clothing/under/syndicate/cosmetic -/datum/gear/strppink +/datum/gear/polykilt + name = "Polychromic Kilt" + category = slot_w_uniform + path = /obj/item/clothing/under/polychromic/kilt + cost = 3 + +/datum/gear/polyshorts + name = "Polychromic Shorts" + category = slot_w_uniform + path = /obj/item/clothing/under/polychromic/shorts + cost = 3 + +/datum/gear/polyshortpants + name = "Polychromic Athletic Shorts" + category = slot_w_uniform + path = /obj/item/clothing/under/polychromic/shortpants + cost = 2 + /datum/gear/strppink name = "Pink stripper outfit" category = slot_w_uniform path = /obj/item/clothing/under/stripper_pink @@ -174,24 +191,6 @@ category = slot_w_uniform path = /obj/item/clothing/under/polychromic/shirt cost = 3 - -/datum/gear/polykilt - name = "Polychromic Kilt" - category = slot_w_uniform - path = /obj/item/clothing/under/polychromic/kilt - cost = 3 - -/datum/gear/polyshorts - name = "Polychromic Shorts" - category = slot_w_uniform - path = /obj/item/clothing/under/polychromic/shorts - cost = 3 - -/datum/gear/polyshortpants - name = "Polychromic Athletic Shorts" - category = slot_w_uniform - path = /obj/item/clothing/under/polychromic/shortpants - cost = 2 // Trekie things //TOS From d845bf84a97474ca1068bc610d35e8ae5863560a Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Wed, 4 Apr 2018 12:56:34 -0500 Subject: [PATCH 17/27] k --- modular_citadel/code/modules/client/loadout/uniform.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index d06eefbb1a..597d2f273d 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -158,7 +158,8 @@ category = slot_w_uniform path = /obj/item/clothing/under/polychromic/shortpants cost = 2 - /datum/gear/strppink + +/datum/gear/strppink name = "Pink stripper outfit" category = slot_w_uniform path = /obj/item/clothing/under/stripper_pink From d2cf2e8018bce3d06877848acf32890ffe72f16b Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Wed, 4 Apr 2018 13:12:27 -0500 Subject: [PATCH 18/27] HMMM --- .../code/modules/client/loadout/uniform.dm | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 597d2f273d..73e39361a3 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -159,40 +159,6 @@ path = /obj/item/clothing/under/polychromic/shortpants cost = 2 -/datum/gear/strppink - name = "Pink stripper outfit" - category = slot_w_uniform - path = /obj/item/clothing/under/stripper_pink - cost = 8 //thots pay the thot toll - -/datum/gear/strpgreen - name = "Green stripper outfit" - category = slot_w_uniform - path = /obj/item/clothing/under/stripper_green - cost = 8 -/datum/gear/sundress - name = "Sundress" - category = slot_w_uniform - path = /obj/item/clothing/under/sundress - -/datum/gear/polyjumpsuit - name = "Polychromic jumpsuit" - category = slot_w_uniform - path = /obj/item/clothing/under/polychromic/jumpsuit - cost = 3 - -/datum/gear/polyskirt - name = "Polychromic SKIRT" - category = slot_w_uniform - path = /obj/item/clothing/under/polychromic/skirt - cost = 3 - -/datum/gear/polyshirt - name = "Polychromic SHIRT" //so people don't misread - category = slot_w_uniform - path = /obj/item/clothing/under/polychromic/shirt - cost = 3 - // Trekie things //TOS /datum/gear/trekcmdtos From 3b4b557687c0fc523997351fc97770a27c8d2772 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Wed, 4 Apr 2018 13:12:52 -0500 Subject: [PATCH 19/27] a --- modular_citadel/code/modules/client/loadout/uniform.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 73e39361a3..90893d1f87 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -158,7 +158,7 @@ category = slot_w_uniform path = /obj/item/clothing/under/polychromic/shortpants cost = 2 - + // Trekie things //TOS /datum/gear/trekcmdtos From 53454d8ab9373a05cbcc8af3bdf22c4d77f026a2 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Wed, 4 Apr 2018 13:13:30 -0500 Subject: [PATCH 20/27] d --- modular_citadel/code/modules/client/loadout/uniform.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 90893d1f87..66ded7b1b3 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -158,7 +158,6 @@ category = slot_w_uniform path = /obj/item/clothing/under/polychromic/shortpants cost = 2 - // Trekie things //TOS /datum/gear/trekcmdtos From c27cb38a534143e51372a5e4ecd807f772feb0cc Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Wed, 4 Apr 2018 13:14:30 -0500 Subject: [PATCH 21/27] hhh --- modular_citadel/code/modules/client/loadout/uniform.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 66ded7b1b3..73e39361a3 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -158,6 +158,7 @@ category = slot_w_uniform path = /obj/item/clothing/under/polychromic/shortpants cost = 2 + // Trekie things //TOS /datum/gear/trekcmdtos From 7459b8b03c398e7e7b07a02f19504bc35264d775 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Wed, 4 Apr 2018 13:16:49 -0500 Subject: [PATCH 22/27] hhhj --- .../code/modules/client/loadout/uniform.dm | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 73e39361a3..3b77e6dae9 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -1,21 +1,3 @@ -/datum/gear/scrubsblue - name = "Blue scrubs" - category = slot_w_uniform - path = /obj/item/clothing/under/rank/medical/blue - restricted_roles = list("Medical Doctor", "Chief Medical Officer") - -/datum/gear/scrubsgreen - name = "Green scrubs" - category = slot_w_uniform - path = /obj/item/clothing/under/rank/medical/green - restricted_roles = list("Medical Doctor", "Chief Medical Officer") - -/datum/gear/scrubspurple - name = "Purple scrubs" - category = slot_w_uniform - path = /obj/item/clothing/under/rank/medical/purple - restricted_roles = list("Medical Doctor", "Chief Medical Officer") - /datum/gear/suitblack name = "Black suit" category = slot_w_uniform From e14ff635ecea5ce5f1740d94c937cb86b78fd0a8 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Wed, 4 Apr 2018 13:18:54 -0500 Subject: [PATCH 23/27] okay --- modular_citadel/code/modules/client/loadout/uniform.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 3b77e6dae9..c07290cdaf 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -140,7 +140,7 @@ category = slot_w_uniform path = /obj/item/clothing/under/polychromic/shortpants cost = 2 - + // Trekie things //TOS /datum/gear/trekcmdtos From e7612b44feec9e7ae2cd0bd512a7da59f981801f Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Wed, 4 Apr 2018 13:19:59 -0500 Subject: [PATCH 24/27] should fix it all --- .../code/modules/client/loadout/uniform.dm | 53 ++++++++++++++++++- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index c07290cdaf..c45260ae10 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -1,4 +1,21 @@ -/datum/gear/suitblack +/datum/gear/scrubsblue + name = "Blue scrubs" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/medical/blue + restricted_roles = list("Medical Doctor", "Chief Medical Officer") + +/datum/gear/scrubsgreen + name = "Green scrubs" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/medical/green + restricted_roles = list("Medical Doctor", "Chief Medical Officer") + +/datum/gear/scrubspurple + name = "Purple scrubs" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/medical/purple + restricted_roles = list("Medical Doctor", "Chief Medical Officer") + /datum/gear/suitblack name = "Black suit" category = slot_w_uniform path = /obj/item/clothing/under/suit_jacket @@ -139,7 +156,39 @@ name = "Polychromic Athletic Shorts" category = slot_w_uniform path = /obj/item/clothing/under/polychromic/shortpants - cost = 2 + cost = 2/datum/gear/strppink + name = "Pink stripper outfit" + category = slot_w_uniform + path = /obj/item/clothing/under/stripper_pink + cost = 8 //thots pay the thot toll + +/datum/gear/strpgreen + name = "Green stripper outfit" + category = slot_w_uniform + path = /obj/item/clothing/under/stripper_green + cost = 8 +/datum/gear/sundress + name = "Sundress" + category = slot_w_uniform + path = /obj/item/clothing/under/sundress + +/datum/gear/polyjumpsuit + name = "Polychromic jumpsuit" + category = slot_w_uniform + path = /obj/item/clothing/under/polychromic/jumpsuit + cost = 3 + +/datum/gear/polyskirt + name = "Polychromic SKIRT" + category = slot_w_uniform + path = /obj/item/clothing/under/polychromic/skirt + cost = 3 + +/datum/gear/polyshirt + name = "Polychromic SHIRT" //so people don't misread + category = slot_w_uniform + path = /obj/item/clothing/under/polychromic/shirt + cost = 3 // Trekie things //TOS From c2615881c7bf65785dfb3e54d42063f84ac7b745 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Wed, 4 Apr 2018 13:21:42 -0500 Subject: [PATCH 25/27] ah --- .../code/modules/client/loadout/uniform.dm | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index c45260ae10..4dfe39f17e 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -156,17 +156,8 @@ name = "Polychromic Athletic Shorts" category = slot_w_uniform path = /obj/item/clothing/under/polychromic/shortpants - cost = 2/datum/gear/strppink - name = "Pink stripper outfit" - category = slot_w_uniform - path = /obj/item/clothing/under/stripper_pink - cost = 8 //thots pay the thot toll + cost = 2 -/datum/gear/strpgreen - name = "Green stripper outfit" - category = slot_w_uniform - path = /obj/item/clothing/under/stripper_green - cost = 8 /datum/gear/sundress name = "Sundress" category = slot_w_uniform @@ -190,6 +181,18 @@ path = /obj/item/clothing/under/polychromic/shirt cost = 3 +/datum/gear/strppink + name = "Pink stripper outfit" + category = slot_w_uniform + path = /obj/item/clothing/under/stripper_pink + cost = 8 //thots pay the thot toll + +/datum/gear/strpgreen + name = "Green stripper outfit" + category = slot_w_uniform + path = /obj/item/clothing/under/stripper_green + cost = 8 + // Trekie things //TOS /datum/gear/trekcmdtos From 34fe469aa21a81c2820a88cb5a8284917a6f862a Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Wed, 4 Apr 2018 13:22:27 -0500 Subject: [PATCH 26/27] hold on --- modular_citadel/code/modules/client/loadout/uniform.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 4dfe39f17e..93d6692afb 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -15,7 +15,8 @@ category = slot_w_uniform path = /obj/item/clothing/under/rank/medical/purple restricted_roles = list("Medical Doctor", "Chief Medical Officer") - /datum/gear/suitblack + +/datum/gear/suitblack name = "Black suit" category = slot_w_uniform path = /obj/item/clothing/under/suit_jacket From 740c76beb974775d78a89e172b0c12b48141eb4c Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Wed, 4 Apr 2018 13:23:15 -0500 Subject: [PATCH 27/27] damn --- .../code/modules/client/loadout/uniform.dm | 53 ------------------- 1 file changed, 53 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 93d6692afb..c07290cdaf 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -1,21 +1,3 @@ -/datum/gear/scrubsblue - name = "Blue scrubs" - category = slot_w_uniform - path = /obj/item/clothing/under/rank/medical/blue - restricted_roles = list("Medical Doctor", "Chief Medical Officer") - -/datum/gear/scrubsgreen - name = "Green scrubs" - category = slot_w_uniform - path = /obj/item/clothing/under/rank/medical/green - restricted_roles = list("Medical Doctor", "Chief Medical Officer") - -/datum/gear/scrubspurple - name = "Purple scrubs" - category = slot_w_uniform - path = /obj/item/clothing/under/rank/medical/purple - restricted_roles = list("Medical Doctor", "Chief Medical Officer") - /datum/gear/suitblack name = "Black suit" category = slot_w_uniform @@ -159,41 +141,6 @@ path = /obj/item/clothing/under/polychromic/shortpants cost = 2 -/datum/gear/sundress - name = "Sundress" - category = slot_w_uniform - path = /obj/item/clothing/under/sundress - -/datum/gear/polyjumpsuit - name = "Polychromic jumpsuit" - category = slot_w_uniform - path = /obj/item/clothing/under/polychromic/jumpsuit - cost = 3 - -/datum/gear/polyskirt - name = "Polychromic SKIRT" - category = slot_w_uniform - path = /obj/item/clothing/under/polychromic/skirt - cost = 3 - -/datum/gear/polyshirt - name = "Polychromic SHIRT" //so people don't misread - category = slot_w_uniform - path = /obj/item/clothing/under/polychromic/shirt - cost = 3 - -/datum/gear/strppink - name = "Pink stripper outfit" - category = slot_w_uniform - path = /obj/item/clothing/under/stripper_pink - cost = 8 //thots pay the thot toll - -/datum/gear/strpgreen - name = "Green stripper outfit" - category = slot_w_uniform - path = /obj/item/clothing/under/stripper_green - cost = 8 - // Trekie things //TOS /datum/gear/trekcmdtos