cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport

Browse Source 
Conflicts:
	baystation12.dme
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/devices/radio/radio.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/say.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/paperwork/paperbin.dm
	html/changelog.html
	icons/turf/areas.dmi
	maps/RandomZLevels/assistantChamber.dmm
	maps/RandomZLevels/fileList.txt

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-10-21 00:25:05 +10:00
parent 3fe88c4fef 6ff45ca10f
commit 2f853fe23a
455 changed files with 6802 additions and 4986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/admin/holder2.dm
View File

@@ -43,6 +43,10 @@ var/list/admin_datums = list()
log_admin("[key_name(usr)] tried to use the admin panel without authorization.")
return
if (!(usr.client.holder.rank in list("Moderator", "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master")))
usr << "\red You cannot perform this action. You must be of a higher administrative rank!"
return
if(href_list["makeAntag"])
switch(href_list["makeAntag"])
if("1")
@@ -181,6 +185,10 @@ var/list/admin_datums = list()
if(href_list["simplemake"])
if (!(src.rank in list("Trial Admin", "Badmin", "Game Admin", "Game Master")))
alert("You cannot perform this action. You must be of a higher administrative rank!")
return
if(!href_list["mob"])
usr << "Invalid mob"
return