diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index f6293454ee..bd6e549d15 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -82,6 +82,7 @@ #define ADMIN_PUNISHMENT_PICKLE "Pickle-ify" #define ADMIN_PUNISHMENT_FRY "Fry" #define ADMIN_PUNISHMENT_PERFORATE ":B:erforate" +#define ADMIN_PUNISHMENT_CLUWNE "Cluwne" #define AHELP_ACTIVE 1 #define AHELP_CLOSED 2 diff --git a/code/datums/mutations/cluwne.dm b/code/datums/mutations/cluwne.dm index 4bd555f8fd..59b7752372 100644 --- a/code/datums/mutations/cluwne.dm +++ b/code/datums/mutations/cluwne.dm @@ -10,7 +10,7 @@ return owner.dna.add_mutation(CLOWNMUT) owner.dna.add_mutation(EPILEPSY) - owner.adjustOrganLoss(ORGAN_SLOT_BRAIN, 200, 200) + owner.adjustOrganLoss(ORGAN_SLOT_BRAIN, 199, 199) var/mob/living/carbon/human/H = owner @@ -32,7 +32,7 @@ /datum/mutation/human/cluwne/on_life(mob/living/carbon/human/owner) if((prob(15) && owner.IsUnconscious())) - owner.adjustOrganLoss(ORGAN_SLOT_BRAIN, 200, 200) // there I changed it to setBrainLoss + owner.adjustOrganLoss(ORGAN_SLOT_BRAIN, 199, 199) // there I changed it to setBrainLoss switch(rand(1, 6)) if(1) owner.say("HONK") diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 3fb4f2e73d..72ec804d28 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1333,9 +1333,10 @@ Traitors and the like can also be revived with the previous role mostly intact. ADMIN_PUNISHMENT_SHOES, ADMIN_PUNISHMENT_PICKLE, ADMIN_PUNISHMENT_FRY, - ADMIN_PUNISHMENT_CRACK, - ADMIN_PUNISHMENT_BLEED, - ADMIN_PUNISHMENT_SCARIFY) + ADMIN_PUNISHMENT_CRACK, + ADMIN_PUNISHMENT_BLEED, + ADMIN_PUNISHMENT_SCARIFY, + ADMIN_PUNISHMENT_CLUWNE) var/punishment = input("Choose a punishment", "DIVINE SMITING") as null|anything in punishment_list @@ -1501,6 +1502,11 @@ Traitors and the like can also be revived with the previous role mostly intact. to_chat(usr,"[C] does not have knottable shoes!") return sick_kicks.adjust_laces(SHOES_KNOTTED) + if(ADMIN_PUNISHMENT_CLUWNE) + if(!iscarbon(target)) + to_chat(usr,"This must be used on a carbon mob.") + return + target.cluwneify() punish_log(target, punishment) @@ -1693,7 +1699,7 @@ Traitors and the like can also be revived with the previous role mostly intact. REMOVE_TRAIT(D,chosen_trait,source) /client/proc/spawn_floor_cluwne() - set category = "Fun" + set category = "Admin.Fun" set name = "Unleash Floor Cluwne" set desc = "Pick a specific target or just let it select randomly and spawn the floor cluwne mob on the station. Be warned: spawning more than one may cause issues!" var/target diff --git a/code/modules/antagonists/wizard/equipment/spellbook.dm b/code/modules/antagonists/wizard/equipment/spellbook.dm index 9b2def48d7..33565700b8 100644 --- a/code/modules/antagonists/wizard/equipment/spellbook.dm +++ b/code/modules/antagonists/wizard/equipment/spellbook.dm @@ -252,6 +252,10 @@ name = "Barnyard Curse" spell_type = /obj/effect/proc_holder/spell/pointed/barnyardcurse +datum/spellbook_entry/cluwnecurse + name = "Cluwne Curse" + spell_type = /obj/effect/proc_holder/spell/targeted/cluwnecurse + /datum/spellbook_entry/charge name = "Charge" spell_type = /obj/effect/proc_holder/spell/targeted/charge diff --git a/code/modules/events/floorcluwne.dm b/code/modules/events/floorcluwne.dm index 47ae322a9c..3df636809a 100644 --- a/code/modules/events/floorcluwne.dm +++ b/code/modules/events/floorcluwne.dm @@ -3,6 +3,7 @@ typepath = /datum/round_event/floor_cluwne max_occurrences = 1 min_players = 20 + weight = 10 /datum/round_event/floor_cluwne/start() diff --git a/code/modules/spells/spell_types/cluwnecurse.dm b/code/modules/spells/spell_types/cluwnecurse.dm index 1c93d8a598..13bfa56915 100644 --- a/code/modules/spells/spell_types/cluwnecurse.dm +++ b/code/modules/spells/spell_types/cluwnecurse.dm @@ -5,7 +5,7 @@ charge_type = "recharge" charge_max = 600 charge_counter = 0 - clothes_req = 1 + clothes_req = SPELL_WIZARD_GARB stat_allowed = 0 invocation = "CLU WO'NIS CA'TE'BEST'IS MAXIMUS!" invocation_type = "shout" @@ -13,7 +13,7 @@ cooldown_min = 75 selection_type = "range" var/list/compatible_mobs = list(/mob/living/carbon/human) - action_icon = '/icons/mob/actions_spells.dmi' + action_icon = 'icons/mob/actions/actions_spells.dmi' action_icon_state = "cluwne" /obj/effect/proc_holder/spell/targeted/cluwnecurse/cast(list/targets, mob/user = usr) diff --git a/tgstation.dme b/tgstation.dme index 436572f623..8b996f3801 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3435,6 +3435,7 @@ #include "code\modules\spells\spell_types\area_teleport.dm" #include "code\modules\spells\spell_types\bloodcrawl.dm" #include "code\modules\spells\spell_types\charge.dm" +#include "code\modules\spells\spell_types\cluwnecurse.dm" #include "code\modules\spells\spell_types\cone_spells.dm" #include "code\modules\spells\spell_types\conjure.dm" #include "code\modules\spells\spell_types\construct_spells.dm"