cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-22 00:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor tweaks

Browse Source 
- Prayers no longer trigger the ahelp sound for admins.
- Explosive fax replaced with firedeath fax.
- Memetic kill agent fax replaced with braindeath fax. Effects are
identical, they just have different names/messaging.
- Evil faxes self-destructing after use now produce a more obvious
message.
This commit is contained in:
Kyep
2016-06-18 00:20:26 -07:00
parent 4f2e3224ff
commit ebafe4fb42
3 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/admin/topic.dm
View File

@@ -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

2
code/modules/admin/verbs/pray.dm
View File

@@ -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!

53
code/modules/paperwork/paper.dm
View File

@@ -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,"<span class='userdanger'>A series of bright lights flash across your vision: MEMETIC KILL AGENT YHWH-3 ACTIVATED</span>")
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,"<span class='userdanger'>A series of bright lights flash across your vision: COGNITOHAZARD YHWH-3 ACTIVATED</span>")
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("<span class='danger'>[src] spontaneously catches fire, and burns up!</span>")
qdel(src)