cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-09 16:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Giving easier admin punishment (#12237)

Browse Source 
* In which I get back at IAAs for faxing their butts

Drop-Bomb a SHIT but this is better

* PP menu works but is lacking content

I guess SOMEONE will make that eventually maybe who knows
This commit is contained in:
Kammerjunk
2016-10-17 10:16:25 +02:00
committed by clusterfack
parent 99e0677d62
commit f99648ec46
4 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/WorkInProgress/kilakk/fax.dm
View File

@@ -207,7 +207,7 @@ var/list/alldepartments = list("Central Command")
/proc/Centcomm_fax(var/obj/item/weapon/paper/sent, var/sentname, var/mob/Sender)
//why the fuck doesnt the thing show as orange
var/msg = "<span class='notice'><b><font color='orange'>CENTCOMM FAX: </font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<a href='?_src_=holder;CentcommFaxReply=\ref[Sender]'>RPLY</a>)</b>: Receiving '[sentname]' via secure connection ... <a href='?_src_=holder;CentcommFaxView=\ref[sent]'>view message</a></span>"
var/msg = "<span class='notice'><b><font color='orange'>CENTCOMM FAX: </font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<a href='?_src_=holder;CentcommFaxReply=\ref[Sender]'>RPLY</a>)</b>: Receiving '[sentname]' via secure connection ... <a href='?_src_=holder;CentcommFaxView=\ref[sent]'>view message</a></span>"
for (var/client/C in admins)
if(C.prefs.special_popup)
C << output(msg, "window1.msay_output")//if i get told to make this a proc imma be fuckin mad

13
code/modules/admin/admin.dm
View File

@@ -97,6 +97,17 @@ var/global/floorIsLava = 0
<A href='?src=\ref[src];subtlemessage=\ref[M]'>Subtle message</A>
"}
if(istype(M, /mob/living/carbon/human))
body += {"<br><br>
<b>Punishments:</b>
<br>"}
body += {"
<A href='?src=\ref[src];BlueSpaceArtillery=\ref[M]'>BSA</A> |
<A href='?src=\ref[src];addcancer=\ref[M]'>Inflict Cancer</A> |
<A href='?src=\ref[src];makecatbeast=\ref[M]'>Make Catbeast</A> |
<A href='?src=\ref[src];makecluwne=\ref[M]'>Make Cluwne</A> |
"}
// Mob-specific controls.
body += M.player_panel_controls(usr)
@@ -127,7 +138,6 @@ var/global/floorIsLava = 0
<A href='?src=\ref[src];makemommi=\ref[M]'>Make MoMMI</A> |
<A href='?src=\ref[src];makealien=\ref[M]'>Make Alien</A> |
<A href='?src=\ref[src];makeslime=\ref[M]'>Make slime</A> |
<A href='?src=\ref[src];makecluwne=\ref[M]'>Make Cluwne</A> |
"}
//Simple Animals
@@ -206,7 +216,6 @@ var/global/floorIsLava = 0
<A href='?src=\ref[src];tdome2=\ref[M]'>Thunderdome Red</A> |
<A href='?src=\ref[src];tdomeadmin=\ref[M]'>Thunderdome Admin</A> |
<A href='?src=\ref[src];tdomeobserve=\ref[M]'>Thunderdome Observer</A> |
<A href='?src=\ref[src];addcancer=\ref[M]'>Inflict Cancer</A> |
"}
// language toggles

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

@@ -1811,6 +1811,25 @@
usr = M //We probably transformed ourselves
show_player_panel(M)
else if(href_list["makecatbeast"])
if(!check_rights(R_SPAWN))
return
var/mob/living/carbon/human/H = locate(href_list["makecatbeast"])
if(!istype(H))
to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
return
if(alert(src.owner, "Are you sure you wish to catbeast [key_name(H)]?", "Catbeast?" , "Yes" , "No") != "Yes")
return
if(H)
H.set_species("Tajaran", force_organs=1)
H.regenerate_icons()
add_gamelogs(usr, "turned [key_name(H)] into a catbeast", tp_link = FALSE)
else
to_chat(usr, "Failed! Something went wrong.")
else if(href_list["makerobot"])
if(!check_rights(R_SPAWN))
return

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

@@ -20,7 +20,7 @@
var/orig_message = msg
var/image/cross = image('icons/obj/storage.dmi',"bible")
msg = "<span class='notice'>[bicon(cross)] <b><font color='purple'>PRAY (DEITY:[ticker.Bible_deity_name]): </font>[key_name(src, 1)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[src]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[src]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[src]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[src]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;adminspawncookie=\ref[src]'>SC</a>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>):</b> [msg]</span>"
msg = "<span class='notice'>[bicon(cross)] <b><font color='purple'>PRAY (DEITY:[ticker.Bible_deity_name]): </font>[key_name(src, 1)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[src]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[src]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[src]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[src]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;adminspawncookie=\ref[src]'>SC</a>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[src]'>BSA</A>):</b> [msg]</span>"
send_prayer_to_admins(msg, 'sound/effects/prayer.ogg')