mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
-Added more info for admin messages in these areas:
Chem smoke will say what reagents are in the chem_smoke. Added a more_info ? to the last fingerprint that touched the grenade. Added a more_info ? to bomb's last fingerprint and the attacher. Admins get a warning message when someone summons guns. Added a jump link to bomb's activation location. Added a jump link to chem smoke's activation location, it will also show you the area's name. -NarSie won't follow mobs in another Z level. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4719 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -1217,6 +1217,25 @@ var/global/floorIsLava = 0
|
||||
sleep(2)
|
||||
C.jumptomob(M)
|
||||
|
||||
if (href_list["adminplayerobservecoodjump"])
|
||||
|
||||
var/x = text2num(href_list["X"])
|
||||
var/y = text2num(href_list["Y"])
|
||||
var/z = text2num(href_list["Z"])
|
||||
|
||||
if(src && src.owner)
|
||||
var/client/C
|
||||
if(istype(src.owner,/client))
|
||||
C = src.owner
|
||||
else if(ismob(src.owner))
|
||||
var/mob/MO = src.owner
|
||||
C = MO.client
|
||||
if(C)
|
||||
if(state == 1)
|
||||
C.admin_ghost()
|
||||
sleep(2)
|
||||
C.jumptocoord(x, y, z)
|
||||
|
||||
if (href_list["adminchecklaws"])
|
||||
if(src && src.owner)
|
||||
output_ai_laws()
|
||||
@@ -2110,16 +2129,17 @@ var/global/floorIsLava = 0
|
||||
|
||||
spawn(0)
|
||||
for(var/i = i, i < length, i++) // 180 = 3 minutes
|
||||
for(var/mob/living/carbon/L in living_mob_list)
|
||||
if(istype(L.loc, /turf/simulated/floor)) // Are they on LAVA?!
|
||||
var/turf/simulated/floor/F = L.loc
|
||||
var/safe = 0
|
||||
for(var/obj/structure/O in F.contents)
|
||||
if(O.level > F.level && !istype(O, /obj/structure/window)) // Something to stand on and it isn't under the floor!
|
||||
safe = 1
|
||||
break
|
||||
if(!safe)
|
||||
L.adjustFireLoss(damage)
|
||||
if(damage)
|
||||
for(var/mob/living/carbon/L in living_mob_list)
|
||||
if(istype(L.loc, /turf/simulated/floor)) // Are they on LAVA?!
|
||||
var/turf/simulated/floor/F = L.loc
|
||||
var/safe = 0
|
||||
for(var/obj/structure/O in F.contents)
|
||||
if(O.level > F.level && !istype(O, /obj/structure/window)) // Something to stand on and it isn't under the floor!
|
||||
safe = 1
|
||||
break
|
||||
if(!safe)
|
||||
L.adjustFireLoss(damage)
|
||||
|
||||
|
||||
sleep(10)
|
||||
|
||||
@@ -502,6 +502,9 @@ var/global/list/uneatable = list(
|
||||
continue
|
||||
if(cult_nh_mind.current.stat)
|
||||
continue
|
||||
var/turf/pos = get_turf(cult_nh_mind.current)
|
||||
if(pos.z != src.z)
|
||||
continue
|
||||
cultists += cult_nh_mind.current
|
||||
if(cultists.len)
|
||||
acquire(pick(cultists))
|
||||
@@ -510,6 +513,9 @@ var/global/list/uneatable = list(
|
||||
for(var/mob/living/carbon/human/food in living_mob_list)
|
||||
if(food.stat)
|
||||
continue
|
||||
var/turf/pos = get_turf(food)
|
||||
if(pos.z != src.z)
|
||||
continue
|
||||
cultists += food
|
||||
if(cultists.len)
|
||||
acquire(pick(cultists))
|
||||
@@ -518,6 +524,9 @@ var/global/list/uneatable = list(
|
||||
for(var/mob/dead/observer/ghost in player_list)
|
||||
if(!ghost.client)
|
||||
continue
|
||||
var/turf/pos = get_turf(ghost)
|
||||
if(pos.z != src.z)
|
||||
continue
|
||||
cultists += ghost
|
||||
if(cultists.len)
|
||||
acquire(pick(cultists))
|
||||
|
||||
Reference in New Issue
Block a user