diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 047d08e9865..25ccd2b9c26 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1678,7 +1678,7 @@ if(!istype(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return - var/etypes = list("borging","corgifying","explosive","memetickillagent","honktumor","demotion") + var/etypes = list("borging","corgifying","firedeath","braindeath","honktumor","demotion") var/eviltype = input(src.owner, "Which type of evil fax do you wish to send [H]?","Its good to be baaaad...", "") as null|anything in etypes if (!(eviltype in etypes)) return diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 6a0ec635d50..170d96754ea 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -18,8 +18,6 @@ for(var/client/X in admins) if(check_rights(R_EVENT,0,X.mob)) to_chat(X, msg) - if(X.prefs.sound & SOUND_ADMINHELP) - X << 'sound/effects/adminhelp.ogg' to_chat(usr, "Your prayers have been received by the gods.") feedback_add_details("admin_verb","PR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 6aed00801b0..cce77ecef31 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -674,35 +674,30 @@ return /obj/item/weapon/paper/evilfax/proc/evilpaper_specialaction(var/mob/living/carbon/target) - if (myeffect == "borging") - target.ForceContractDisease(new /datum/disease/transformation/robot(0)) - else if (myeffect == "corgifying") - target.ForceContractDisease(new /datum/disease/transformation/corgi(0)) - else if (myeffect == "explosive") - var/turf/simulated/floor/T = get_turf(target) - if (istype(T)) - T.break_tile_to_plating() - var/obj/effect/stop/S - S = new /obj/effect/stop - S.victim = target - S.loc = target.loc - spawn(20) - qdel(S) - target.adjustBruteLoss(target.health) - else if (myeffect == "memetickillagent") - to_chat(target,"A series of bright lights flash across your vision: MEMETIC KILL AGENT YHWH-3 ACTIVATED") - target.mutations.Add(NOCLONE) - target.adjustBrainLoss(125) - else if (myeffect == "honktumor") - if(!target.get_int_organ(/obj/item/organ/internal/honktumor)) - new /obj/item/organ/internal/honktumor(target) - else if (myeffect == "demotion") - command_announcement.Announce("[mytarget] is hereby demoted to the rank of Civilian. Process this demotion immediately. Failure to comply with these orders is grounds for termination.","CC Demotion Order") - else - message_admins("Evil paper [src] was activated without a proper effect set! This is a bug.") - used = 1 - evilpaper_selfdestruct() + spawn(30) + if (istype(target,/mob/living/carbon)) + if (myeffect == "borging") + target.ForceContractDisease(new /datum/disease/transformation/robot(0)) + else if (myeffect == "corgifying") + target.ForceContractDisease(new /datum/disease/transformation/corgi(0)) + else if (myeffect == "firedeath") + var/turf/simulated/T = get_turf(target) + new /obj/effect/hotspot(T) + target.adjustFireLoss(target.health) + else if (myeffect == "braindeath") + to_chat(target,"A series of bright lights flash across your vision: COGNITOHAZARD YHWH-3 ACTIVATED") + target.mutations.Add(NOCLONE) + target.adjustBrainLoss(125) + else if (myeffect == "honktumor") + if(!target.get_int_organ(/obj/item/organ/internal/honktumor)) + new /obj/item/organ/internal/honktumor(target) + else if (myeffect == "demotion") + command_announcement.Announce("[mytarget] is hereby demoted to the rank of Civilian. Process this demotion immediately. Failure to comply with these orders is grounds for termination.","CC Demotion Order") + else + message_admins("Evil paper [src] was activated without a proper effect set! This is a bug.") + used = 1 + evilpaper_selfdestruct() /obj/item/weapon/paper/evilfax/proc/evilpaper_selfdestruct() - visible_message("[src] spontaneously catches fire, and burns up!") + visible_message("[src] spontaneously catches fire, and burns up!") qdel(src)