This commit is contained in:
FalseIncarnate
2016-12-21 17:36:10 -05:00
parent 1913969578
commit 48cf5148f0
3 changed files with 14 additions and 33 deletions
+1 -8
View File
@@ -17,17 +17,10 @@ var/global/datum/controller/process/mob_hunt/mob_hunt_server
start_delay = 20
mob_hunt_server = src
/datum/controller/process/mob_hunt/Destroy()
for(var/datum/data/pda/app/mob_hunter_game/client in connected_clients)
client.disconnect("Server Destruction")
if(mob_hunt_server && mob_hunt_server == src)
mob_hunt_server = null
return ..()
/datum/controller/process/mob_hunt/doWork()
if(reset_cooldown) //if reset_cooldown is set (we are on cooldown, duh), reduce the remaining cooldown every cycle
reset_cooldown--
if(server_status == 0)
if(!server_status)
return
client_mob_update()
if(normal_spawns.len < max_normal_spawns)
+1 -1
View File
@@ -61,7 +61,7 @@
if(mob_info.is_trap) //traps work even if you ran into them before, which is why this is before the clients_encountered check
if(client.hacked) //hacked copies of the game (copies capable of setting traps) are protected from traps
return
if(istype(P.loc, /mob/living/carbon))
if(iscarbon(P.loc))
var/mob/living/carbon/C = P.loc
//Strike them down with a lightning bolt to complete the illusion (copied from the surge reagent overdose, probably could make this a general-use proc in the future)
playsound(get_turf(C), 'sound/effects/eleczap.ogg', 75, 1)