From d0fa073a5ddd95429cb06a2384d2f15df357f35a Mon Sep 17 00:00:00 2001 From: Cebutris Date: Mon, 12 Feb 2018 21:57:24 -0500 Subject: [PATCH 1/3] adds in a hallucinogenic collar and a dirty sweater --- code/citadel/custom_loadout/custom_items.dm | 34 +++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/code/citadel/custom_loadout/custom_items.dm b/code/citadel/custom_loadout/custom_items.dm index 7e1c053d25..1c7b95c268 100644 --- a/code/citadel/custom_loadout/custom_items.dm +++ b/code/citadel/custom_loadout/custom_items.dm @@ -263,3 +263,37 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS icon = 'icons/obj/custom.dmi' icon_override = 'icons/mob/custom_w.dmi' + +/*TechnicalMagi*/ +/obj/item/clothing/under/bb_sweater/black/naomi + name = "worn black sweater" + desc = "A well-loved sweater, showing signs of several cleanings and re-stitchings. And a few stains. Is that cat fur?" + +/obj/item/clothing/neck/petcollar/naomi + name = "worn pet collar" + desc = "a pet collar that looks well used." + +/obj/item/clothing/neck/petcollar/naomi/examine(mob/user) + . = ..() + if(usr.ckey != "technicalmagi") + to_chat(user, "There's something odd about the it. You probably shouldn't wear it...")//warn people not to wear it if they're not Naomi, lest they become as crazy as she is + +/obj/item/clothing/neck/petcollar/naomi/equipped() + . = ..() + START_PROCESSING(SSobj, src) + +/obj/item/clothing/neck/petcollar/naomi/dropped() + . = ..() + STOP_PROCESSING(SSobj, src) + +/obj/item/clothing/neck/petcollar/naomi/process() + var/mob/living/carbon/human/H + if(ishuman(loc)) + H = loc + if(!H) + return + else if(H.get_item_by_slot(slot_neck) == src) + if(H.arousalloss < H.max_arousal / 3) + H.arousalloss = H.max_arousal / 3 + if(prob(5)) + H.hallucination += 10 \ No newline at end of file From d54a92ef46db9359a594b913e6210064739b64a9 Mon Sep 17 00:00:00 2001 From: Cebutris Date: Mon, 12 Feb 2018 22:04:44 -0500 Subject: [PATCH 2/3] adds the crazy catslut stuff to the loadout --- .../code/modules/client/loadout/__donator.dm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index 0cbabd3ca5..c28ae631d7 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -180,3 +180,15 @@ category = slot_hands path = /obj/item/storage/backpack/satchel/carrot ckeywhitelist = list("improvedname") + +/datum/gear/naomisweater + name = "worn black sweater" + category = slot_w_uniform + path = /obj/item/clothing/under/bb_sweater/black/naomi + ckeywhitelist = list("technicalmagi") + +/datum/gear/naomicollar + name = "worn pet collar" + category = slot_neck + path = /obj/item/clothing/neck/petcollar/naomi + ckeywhitelist = list("technicalmagi") \ No newline at end of file From 440e39ed68318d62f0fcd5429e2f754a18f3c797 Mon Sep 17 00:00:00 2001 From: Cebutris Date: Mon, 12 Feb 2018 22:15:53 -0500 Subject: [PATCH 3/3] limits the hallucinations a little --- code/citadel/custom_loadout/custom_items.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/citadel/custom_loadout/custom_items.dm b/code/citadel/custom_loadout/custom_items.dm index 1c7b95c268..3b4501153e 100644 --- a/code/citadel/custom_loadout/custom_items.dm +++ b/code/citadel/custom_loadout/custom_items.dm @@ -295,5 +295,5 @@ else if(H.get_item_by_slot(slot_neck) == src) if(H.arousalloss < H.max_arousal / 3) H.arousalloss = H.max_arousal / 3 - if(prob(5)) + if(prob(5) && H.hallucination < 15) H.hallucination += 10 \ No newline at end of file