cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 18:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes issue 420

Browse Source 
Fixes issue 417

- Ghosts no longer block AI spawning
- Grilles no longer shock you if you're in an exosuit

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3279 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
quartz235@gmail.com
2012-03-12 23:49:13 +00:00
parent 859d5ff0a3
commit 3300dc7398
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/transform_procs.dm
View File

@@ -96,13 +96,13 @@
for(var/obj/effect/landmark/start/sloc in world) for(var/obj/effect/landmark/start/sloc in world)
if (sloc.name != "AI") if (sloc.name != "AI")
continue continue
if (locate(/mob) in sloc.loc) if (locate(/mob/living) in sloc.loc)
continue continue
loc_landmark = sloc loc_landmark = sloc
if (!loc_landmark) if (!loc_landmark)
for(var/obj/effect/landmark/tripai in world) for(var/obj/effect/landmark/tripai in world)
if (tripai.name == "tripai") if (tripai.name == "tripai")
if(locate(/mob) in tripai.loc) if(locate(/mob/living) in tripai.loc)
continue continue
loc_landmark = tripai loc_landmark = tripai
if (!loc_landmark) if (!loc_landmark)

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

@@ -437,6 +437,8 @@
//source is an object caused electrocuting (airlock, grille, etc) //source is an object caused electrocuting (airlock, grille, etc)
//No animations will be performed by this proc. //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) /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
if(istype(M,/mob/living/carbon/human)) if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M var/mob/living/carbon/human/H = M
if(H.gloves) if(H.gloves)