cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-06 07:22:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added a config option for the extended adminwho information because it is generally a bad idea to tell the players what admins are doing.

Browse Source 
Also fixed the issue where people on the floor could buckle others in.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4216 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2012-07-29 11:09:07 +00:00
parent 4b41009ee9
commit a4890eaae0
6 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/datums/configuration.dm
View File

@@ -30,6 +30,7 @@
var/feature_object_spell_system = 0 //spawns a spellbook which gives object-type spells instead of verb-type spells for the wizard
var/traitor_scaling = 0 //if amount of traitors scales based on amount of players
var/protect_roles_from_antagonist = 0// If security and such can be tratior/cult/other
var/show_admin_info = 0 //If true will show players extended admin info in adminwho, aka a bad idea.
var/Tensioner_Active = 0 // If the tensioner is running.
var/allow_Metadata = 0 // Metadata is supported.
var/popup_admin_pm = 0 //adminPMs to non-admins show in a pop-up 'reply' window when set to 1.
@@ -247,6 +248,9 @@
if("protect_roles_from_antagonist")
config.protect_roles_from_antagonist = 1
if("show_admin_info")
config.show_admin_info = 1
if("tensioner_active")
config.Tensioner_Active = 1

2
code/game/jobs/job_controller.dm
View File

@@ -1,5 +1,3 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
var/global/datum/controller/occupations/job_master
/datum/controller/occupations

39
code/game/jobs/jobs.dm
View File

@@ -1,24 +1,23 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
var/const/ENGSEC =(1<<0)
var/const/ENGSEC =(1<<0)
var/const/CAPTAIN =(1<<0)
var/const/HOS =(1<<1)
var/const/WARDEN =(1<<2)
var/const/DETECTIVE =(1<<3)
var/const/DETECTIVE =(1<<3)
var/const/OFFICER =(1<<4)
var/const/CHIEF =(1<<5)
var/const/ENGINEER =(1<<6)
var/const/ATMOSTECH =(1<<7)
var/const/CHIEF =(1<<5)
var/const/ENGINEER =(1<<6)
var/const/ATMOSTECH =(1<<7)
var/const/ROBOTICIST =(1<<8)
var/const/AI =(1<<9)
var/const/CYBORG =(1<<10)
var/const/MEDSCI =(1<<1)
var/const/MEDSCI =(1<<1)
var/const/RD =(1<<0)
var/const/SCIENTIST =(1<<1)
var/const/SCIENTIST =(1<<1)
var/const/CHEMIST =(1<<2)
var/const/CMO =(1<<3)
var/const/DOCTOR =(1<<4)
@@ -26,22 +25,22 @@ var/const/GENETICIST =(1<<5)
var/const/VIROLOGIST =(1<<6)
var/const/CIVILIAN =(1<<2)
var/const/CIVILIAN =(1<<2)
var/const/HOP =(1<<0)
var/const/BARTENDER =(1<<1)
var/const/BOTANIST =(1<<2)
var/const/CHEF =(1<<3)
var/const/BARTENDER =(1<<1)
var/const/BOTANIST =(1<<2)
var/const/CHEF =(1<<3)
var/const/JANITOR =(1<<4)
var/const/LIBRARIAN =(1<<5)
var/const/QUARTERMASTER =(1<<6)
var/const/CARGOTECH =(1<<7)
var/const/MINER =(1<<8)
var/const/LIBRARIAN =(1<<5)
var/const/QUARTERMASTER =(1<<6)
var/const/CARGOTECH =(1<<7)
var/const/MINER =(1<<8)
var/const/LAWYER =(1<<9)
var/const/CHAPLAIN =(1<<10)
var/const/CLOWN =(1<<11)
var/const/MIME =(1<<12)
var/const/ASSISTANT =(1<<13)
var/const/CHAPLAIN =(1<<10)
var/const/CLOWN =(1<<11)
var/const/MIME =(1<<12)
var/const/ASSISTANT =(1<<13)
var/list/assistant_occupations = list(

4
code/game/objects/stool.dm
View File

@@ -74,7 +74,7 @@
/obj/structure/stool/bed/proc/buckle_mob(mob/M as mob, mob/user as mob)
if (!ticker)
user << "You can't buckle anyone in before the game starts."
if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || usr.stat || M.buckled || istype(user, /mob/living/silicon/pai) )
if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || user.lying || user.stat || M.buckled || istype(user, /mob/living/silicon/pai) )
return
unbuckle()
@@ -152,7 +152,7 @@
buckled_mob.loc = src.loc
/obj/structure/stool/bed/roller/buckle_mob(mob/M as mob, mob/user as mob)
if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || usr.stat || M.buckled || istype(usr, /mob/living/silicon/pai) )
if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || user.lying || user.stat || M.buckled || istype(usr, /mob/living/silicon/pai) )
return
M.pixel_y = 6
density = 1

2
code/game/verbs/who.dm
View File

@@ -46,7 +46,7 @@ proc/get_all_admin_clients()
for (var/mob/M in admin_list)
if(M && M.client && M.client.holder)
if(usr.client)
if((usr.client && usr.client.holder) || config.show_admin_info)
var/afk = 0
if( M.client.inactivity > AFK_THRESHOLD ) //When I made this, the AFK_THRESHOLD was 3000ds = 300s = 5m, see setup.dm for the new one.
afk = 1