cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into Baystation12-master

Browse Source 
Conflicts:
	config/example/config.txt
	config/example/motd.txt
	config/example/rules.html
This commit is contained in:
ZomgPonies
2013-09-05 13:29:34 -04:00
parent 88cd7f1577 ee156376a3
commit ed8714550c
210 changed files with 617 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+2 -2
View File
@@ -12,8 +12,8 @@ var/global/floorIsLava = 0
C << msg
/proc/msg_admin_attack(var/text) //Toggleable Attack Messages
var/rendered = "<span class=\"admin\"><span class=\"prefix\">ADMIN LOG:</span> <span class=\"message\">[text]</span></span>"
log_adminwarn(rendered)
log_attack(text)
var/rendered = "<span class=\"admin\"><span class=\"prefix\">ATTACK:</span> <span class=\"message\">[text]</span></span>"
for(var/client/C in admins)
if(R_ADMIN & C.holder.rights)
if(C.prefs.toggles & CHAT_ATTACKLOGS)
code/modules/admin/admin_verbs.dm
+2 -2
View File
@@ -354,13 +354,13 @@ var/list/admin_verbs_mod = list(
mob.invisibility = initial(mob.invisibility)
mob << "\red <b>Invisimin off. Invisibility reset.</b>"
mob.icon_state = "ghost"
mob.icon = 'human.dmi'
mob.icon = 'icons/mob/human.dmi'
mob.update_icons()
else
mob.invisibility = INVISIBILITY_OBSERVER
mob << "\blue <b>Invisimin on. You are now as invisible as a ghost.</b>"
mob.icon_state = "ghost"
mob.icon = 'mob.dmi'
mob.icon = 'icons/mob/mob.dmi'
/client/proc/player_panel()
code/modules/admin/permissionverbs/permissionedit.dm
+2 -2
View File
@@ -12,8 +12,8 @@
<html>
<head>
<title>Permissions Panel</title>
<script type='text/javascript' src='search.js'></script>
<link rel='stylesheet' type='text/css' href='panels.css'>
<script type='text/javascript' src='html/search.js'></script>
<link rel='stylesheet' type='text/css' href='html/panels.css'>
</head>
<body onload='selectTextField();updateSearch();'>
<div id='main'><table id='searchable' cellspacing='0'>
code/modules/admin/verbs/playsound.dm
+1 -1
View File
@@ -62,7 +62,7 @@ client/proc/space_asshole()
for(var/mob/M in world)
if(M.client)
if(M.client.midis)
M << 'space_asshole.ogg'
M << 'sound/music/space_asshole.ogg'
client/proc/honk_theme()
code/modules/admin/verbs/randomverbs.dm
+1 -1
View File
@@ -483,7 +483,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if("No")
world << "\red New NanoTrasen Update available at all communication consoles."
world << sound('commandreport.ogg')
world << sound('sound/AI/commandreport.ogg')
log_admin("[key_name(src)] has created a command report: [input]")
message_admins("[key_name_admin(src)] has created a command report", 1)
feedback_add_details("admin_verb","CCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!