From 57af7ba8af6d2217edda559d545db617bb7c7e4a Mon Sep 17 00:00:00 2001 From: Commandersand Date: Fri, 29 Nov 2019 01:24:24 -0600 Subject: [PATCH 01/13] add plaid skirt,multipen,fountainpen to loadout --- .../code/modules/client/loadout/backpack.dm | 33 ++++++++++++------- .../code/modules/client/loadout/uniform.dm | 6 ++++ 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index c2713b49be..2b15fa29c5 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -63,16 +63,6 @@ category = SLOT_IN_BACKPACK path = /obj/item/dildo/custom -/datum/gear/paperbin - name = "Paper Bin" - category = SLOT_IN_BACKPACK - path = /obj/item/paper_bin - -/datum/gear/crayons - name = "Box of crayons" - category = SLOT_IN_BACKPACK - path = /obj/item/storage/crayons - /datum/gear/toykatana name = "Toy Katana" category = SLOT_IN_BACKPACK @@ -99,4 +89,25 @@ /datum/gear/tape name = "Spare cassette tape" category = SLOT_IN_BACKPACK - path = /obj/item/tape/random \ No newline at end of file + path = /obj/item/tape/random + +/datum/gear/paperbin + name = "Paper Bin" + category = SLOT_IN_BACKPACK + path = /obj/item/paper_bin + +/datum/gear/crayons + name = "Box of crayons" + category = SLOT_IN_BACKPACK + path = /obj/item/storage/crayons + +/datum/gear/multipen + name "A multicolored pen" + category = SLOT_IN_BACKPACK + path = /obj/item/pen/fourcolor + +/datum/gear/fountainpen + name "A fancy pen" + category = SLOT_IN_BACKPACK + path = /obj/item/pen/fountain + cost = 2 diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index abdf8e3a24..eb6a1b3d71 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -73,6 +73,12 @@ category = SLOT_W_UNIFORM path = /obj/item/clothing/under/skirt/purple +/datum/gear/skirtpurple + name = "Plaid skirt" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/plaid_skirt + + /datum/gear/schoolgirlblue name = "Blue Schoolgirl Uniform" category = SLOT_W_UNIFORM From b715c088f60fa3d0d4089e3cc26411292fc582e4 Mon Sep 17 00:00:00 2001 From: Commandersand Date: Fri, 29 Nov 2019 01:27:15 -0600 Subject: [PATCH 02/13] add athletic shorts to loadout --- modular_citadel/code/modules/client/loadout/uniform.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index eb6a1b3d71..f38f74fb1b 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -114,6 +114,11 @@ category = SLOT_W_UNIFORM path = /obj/item/clothing/under/pants/camo +/datum/gear/athleticshorts + name = "Athletic Shorts" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/shorts + /datum/gear/bjeans name = "Black Jeans" category = SLOT_W_UNIFORM From 5b7bf08d108176c24157d821773fec01688bd28e Mon Sep 17 00:00:00 2001 From: Commandersand Date: Fri, 29 Nov 2019 01:47:41 -0600 Subject: [PATCH 03/13] sundress --- modular_citadel/code/modules/client/loadout/uniform.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index f38f74fb1b..a9a1ddeeb8 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -104,6 +104,11 @@ category = SLOT_W_UNIFORM path = /obj/item/clothing/under/stripeddress +/datum/gear/sundress + name = "Sundress" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/sundress + /datum/gear/kilt name = "Kilt" category = SLOT_W_UNIFORM From 22d0dbc05b247802666e239c87fda4badcc963fd Mon Sep 17 00:00:00 2001 From: Commandersand Date: Fri, 29 Nov 2019 01:56:47 -0600 Subject: [PATCH 04/13] sundress and stripper --- .../code/modules/client/loadout/uniform.dm | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index a9a1ddeeb8..e9ef48f269 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -104,11 +104,6 @@ category = SLOT_W_UNIFORM path = /obj/item/clothing/under/stripeddress -/datum/gear/sundress - name = "Sundress" - category = SLOT_W_UNIFORM - path = /obj/item/clothing/under/sundress - /datum/gear/kilt name = "Kilt" category = SLOT_W_UNIFORM @@ -329,4 +324,16 @@ /datum/gear/gear_harnesses name = "Gear Harness" category = SLOT_W_UNIFORM - path = /obj/item/clothing/under/gear_harness \ No newline at end of file + path = /obj/item/clothing/under/gear_harness + +/datum/gear/pinkstripper + name = "Pink stripper outfit" + categor = SLOT_W_UNIFORM + path = /obj/item/clothing/under/stripper_pink + cost = 3 + +/datum/gear/pinkstripper + name = "Green stripper outfit" + categor = SLOT_W_UNIFORM + path = /obj/item/clothing/under/stripper_green + cost = 3 \ No newline at end of file From 60cee5814a214faee0f5ea2244cc2059ff3ce9d7 Mon Sep 17 00:00:00 2001 From: Commandersand Date: Fri, 29 Nov 2019 01:59:34 -0600 Subject: [PATCH 05/13] keyholesweater --- modular_citadel/code/modules/client/loadout/uniform.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index e9ef48f269..9b003b1524 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -191,6 +191,11 @@ category = SLOT_W_UNIFORM path = /obj/item/clothing/under/bb_sweater/blue +/datum/gear/keyholesweater + name = "Keyhole Sweater" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/keyholesweater + /datum/gear/polykilt name = "Polychromic Kilt" category = SLOT_W_UNIFORM From 2c2f3ea8aaf6f5cb82e2b3ad87fbf224f698206e Mon Sep 17 00:00:00 2001 From: Commandersand Date: Fri, 29 Nov 2019 02:03:31 -0600 Subject: [PATCH 06/13] mandatory meme --- modular_citadel/code/modules/client/loadout/mask.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modular_citadel/code/modules/client/loadout/mask.dm b/modular_citadel/code/modules/client/loadout/mask.dm index 036e3d3795..2b914923f8 100644 --- a/modular_citadel/code/modules/client/loadout/mask.dm +++ b/modular_citadel/code/modules/client/loadout/mask.dm @@ -7,3 +7,9 @@ name = "Fake moustache" category = SLOT_WEAR_MASK path = /obj/item/clothing/mask/fakemoustache + +/datum/gear/joy + name = "Joy mask" + category = SLOT_WEAR_MASK + path = /obj/item/clothing/mask/joy + cost = 9 \ No newline at end of file From f9d8c41c3e97fdaa6b0967ca43d3c31493725086 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Fri, 29 Nov 2019 02:32:47 -0600 Subject: [PATCH 07/13] newline needed apparently --- modular_citadel/code/modules/client/loadout/mask.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/client/loadout/mask.dm b/modular_citadel/code/modules/client/loadout/mask.dm index 2b914923f8..82824814ae 100644 --- a/modular_citadel/code/modules/client/loadout/mask.dm +++ b/modular_citadel/code/modules/client/loadout/mask.dm @@ -12,4 +12,5 @@ name = "Joy mask" category = SLOT_WEAR_MASK path = /obj/item/clothing/mask/joy - cost = 9 \ No newline at end of file + cost = 9 + From 0da35fdde59b857c3c3355bebf53d0b4e05a43ae Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Fri, 29 Nov 2019 02:33:33 -0600 Subject: [PATCH 08/13] again --- 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 9b003b1524..44cb3086bc 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -341,4 +341,5 @@ name = "Green stripper outfit" categor = SLOT_W_UNIFORM path = /obj/item/clothing/under/stripper_green - cost = 3 \ No newline at end of file + cost = 3 + From c8bc6941eb145bf00e4dbd0c2c9aacf893aabdfc Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Fri, 29 Nov 2019 02:46:31 -0600 Subject: [PATCH 09/13] "don't copy paste code" --- 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 44cb3086bc..e06c27f0e3 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -337,7 +337,7 @@ path = /obj/item/clothing/under/stripper_pink cost = 3 -/datum/gear/pinkstripper +/datum/gear/greenstripper name = "Green stripper outfit" categor = SLOT_W_UNIFORM path = /obj/item/clothing/under/stripper_green From a6080035550953478860e89a031cf4b0d5ef92f5 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Fri, 29 Nov 2019 10:53:57 -0600 Subject: [PATCH 10/13] Equals --- modular_citadel/code/modules/client/loadout/backpack.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index 2b15fa29c5..de5f2b939e 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -102,7 +102,7 @@ path = /obj/item/storage/crayons /datum/gear/multipen - name "A multicolored pen" + name = "A multicolored pen" category = SLOT_IN_BACKPACK path = /obj/item/pen/fourcolor From 88bd7678b192a364b74c33a9e0293d7fb2b823a9 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Fri, 29 Nov 2019 10:55:00 -0600 Subject: [PATCH 11/13] Eee --- modular_citadel/code/modules/client/loadout/backpack.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index de5f2b939e..aa103d5ee8 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -107,7 +107,7 @@ path = /obj/item/pen/fourcolor /datum/gear/fountainpen - name "A fancy pen" + name = "A fancy pen" category = SLOT_IN_BACKPACK path = /obj/item/pen/fountain cost = 2 From 7ddaaea26750a08dedef2c1ef0e3a57fd0e56279 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Fri, 29 Nov 2019 10:56:18 -0600 Subject: [PATCH 12/13] Cats --- modular_citadel/code/modules/client/loadout/uniform.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index e06c27f0e3..2f3bcaa88d 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -333,13 +333,13 @@ /datum/gear/pinkstripper name = "Pink stripper outfit" - categor = SLOT_W_UNIFORM + category = SLOT_W_UNIFORM path = /obj/item/clothing/under/stripper_pink cost = 3 /datum/gear/greenstripper name = "Green stripper outfit" - categor = SLOT_W_UNIFORM + category = SLOT_W_UNIFORM path = /obj/item/clothing/under/stripper_green cost = 3 From 67754daf22c6074a75de753caff9e367c9c43e64 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Fri, 29 Nov 2019 10:57:51 -0600 Subject: [PATCH 13/13] Fixed --- modular_citadel/code/modules/client/loadout/uniform.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 2f3bcaa88d..232e37d921 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -73,12 +73,11 @@ category = SLOT_W_UNIFORM path = /obj/item/clothing/under/skirt/purple -/datum/gear/skirtpurple +/datum/gear/skirtplaid name = "Plaid skirt" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/plaid_skirt - /datum/gear/schoolgirlblue name = "Blue Schoolgirl Uniform" category = SLOT_W_UNIFORM