diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 5273a02d48f..9246880ab82 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1682,9 +1682,13 @@ 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 + var/customname = input(src.owner, "Pick a title for the evil fax.", "Fax Title") as text|null + if(!customname) + customname = "paper" var/obj/item/weapon/paper/evilfax/P = new /obj/item/weapon/paper/evilfax(null) var/obj/machinery/photocopier/faxmachine/fax = locate(href_list["originfax"]) - P.name = "Central Command - paper" + + P.name = "Central Command - [customname]" P.info = "A reminder: per the terms of your contract, stupid faxes will get you demoted, or worse." P.myeffect = eviltype P.mytarget = H diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 05b396c6c0a..bc216c5f2ac 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -646,11 +646,11 @@ /obj/item/weapon/paper/evilfax/New() ..() - processing_objects += src + processing_objects.Add(src) /obj/item/weapon/paper/evilfax/Destroy() - processing_objects -= src + processing_objects.Remove(src) if(mytarget && !used) var/mob/living/carbon/target = mytarget target.ForceContractDisease(new /datum/disease/transformation/corgi(0)) @@ -658,7 +658,7 @@ /obj/item/weapon/paper/evilfax/process() - if(countdown == 0) + if(!countdown) if(mytarget) if(activate_on_timeout) evilpaper_specialaction(mytarget) @@ -681,7 +681,7 @@ else if(myeffect == "firedeath") var/turf/simulated/T = get_turf(target) new /obj/effect/hotspot(T) - target.adjustFireLoss(target.health) + target.adjustFireLoss(150) // hard crit, the burning takes care of the rest. else if(myeffect == "braindeath") to_chat(target,"A series of bright lights flash across your vision: COGNITOHAZARD YHWH-3 ACTIVATED") target.mutations.Add(NOCLONE)