cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 16:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #117, Fixes #118, Fixes #667 (#668)

Browse Source
This commit is contained in:
NanakoAC
2016-08-03 20:33:06 +01:00
committed by skull132
parent d38e6d164f
commit 3979c813ca
4 changed files with 80 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/mob/new_player/new_player.dm
View File

@@ -404,8 +404,9 @@
if(job && IsJobAvailable(job.title))
var/active = 0
// Only players with the job assigned and AFK for less than 10 minutes count as active
for(var/mob/M in player_list) if(M.mind && M.client && M.mind.assigned_role == job.title && M.client.inactivity <= 10 * 60 * 10)
active++
for(var/mob/M in player_list) //Added isliving check here, so it won't check ghosts and qualify them as active
if(isliving(M) && M.mind && M.client && M.mind.assigned_role == job.title && M.client.inactivity <= 10 * 60 * 10)
active++
dat += "<a href='byond://?src=\ref[src];SelectedJob=[job.title]'>[job.title] ([job.current_positions]) (Active: [active])</a><br>"
dat += "</center>"

9
code/modules/power/power.dm
View File

@@ -313,8 +313,10 @@
//No animations will be performed by this proc.
/proc/electrocute_mob(mob/living/carbon/M as mob, var/power_source, var/obj/source, var/siemens_coeff = 1.0)
if(istype(M.loc,/obj/mecha)) return 0 //feckin mechs are dumb
var/mob/living/carbon/human/H = M //20/1/16 Insulation (vaurca)
if(H.species.name == "Vaurca") return 0
var/mob/living/carbon/human/H = null
if (ishuman(M))
H = M //20/1/16 Insulation (vaurca)
if(H.species.name == "Vaurca") return 0
var/area/source_area
if(istype(power_source,/area))
source_area = power_source
@@ -344,8 +346,7 @@
//If following checks determine user is protected we won't alarm for long.
if(PN)
PN.trigger_warning(5)
if(istype(M,/mob/living/carbon/human))
//var/mob/living/carbon/human/H = M
if(H)
if(H.species.siemens_coefficient == 0)
return
if(H.gloves)