cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed the ability to create unrobustable windowstacks.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@574 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
n3ophyt3@gmail.com
2010-12-09 04:55:21 +00:00
parent 0bbfc0bfa6
commit 67afc064c3
5 changed files with 88 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+9
View File
@@ -94,6 +94,10 @@ to clean it up, or just beat the shit out of it (which takes ages).
src.now_pushing = 1
if (!AM.anchored)
var/t = get_dir(src, AM)
if (istype(AM, /obj/window))
if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST)
for(var/obj/window/win in get_step(AM,t))
return
step(AM, t)
src.now_pushing = null
return
@@ -422,6 +426,11 @@ to clean it up, or just beat the shit out of it (which takes ages).
step(src.pulling, get_dir(src.pulling.loc, T))
M.pulling = t
else
if (src.pulling)
if (istype(src.pulling, /obj/window))
if(src.pulling:ini_dir == NORTHWEST || src.pulling:ini_dir == NORTHEAST || src.pulling:ini_dir == SOUTHWEST || src.pulling:ini_dir == SOUTHEAST)
for(var/obj/window/win in get_step(src.pulling,get_dir(src.pulling.loc, T)))
src.pulling = null
if (src.pulling)
step(src.pulling, get_dir(src.pulling.loc, T))
else
code/modules/mob/living/carbon/human/human.dm
+9
View File
@@ -107,6 +107,10 @@
src.now_pushing = 1
if (!AM.anchored)
var/t = get_dir(src, AM)
if (istype(AM, /obj/window))
if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST)
for(var/obj/window/win in get_step(AM,t))
return
step(AM, t)
src.now_pushing = null
return
@@ -917,6 +921,11 @@
step(src.pulling, get_dir(src.pulling.loc, T))
M.pulling = t
else
if (src.pulling)
if (istype(src.pulling, /obj/window))
if(src.pulling:ini_dir == NORTHWEST || src.pulling:ini_dir == NORTHEAST || src.pulling:ini_dir == SOUTHWEST || src.pulling:ini_dir == SOUTHEAST)
for(var/obj/window/win in get_step(src.pulling,get_dir(src.pulling.loc, T)))
src.pulling = null
if (src.pulling)
step(src.pulling, get_dir(src.pulling.loc, T))
else
code/modules/mob/living/carbon/monkey/monkey.dm
+11 -1
View File
@@ -62,6 +62,10 @@
src.now_pushing = 1
if (!( AM.anchored ))
var/t = get_dir(src, AM)
if (istype(AM, /obj/window))
if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST)
for(var/obj/window/win in get_step(AM,t))
return
step(AM, t)
src.now_pushing = null
return
@@ -367,7 +371,13 @@
step(src.pulling, get_dir(src.pulling.loc, T))
M.pulling = t
else
step(src.pulling, get_dir(src.pulling.loc, T))
if (src.pulling)
if (istype(src.pulling, /obj/window))
if(src.pulling:ini_dir == NORTHWEST || src.pulling:ini_dir == NORTHEAST || src.pulling:ini_dir == SOUTHWEST || src.pulling:ini_dir == SOUTHEAST)
for(var/obj/window/win in get_step(src.pulling,get_dir(src.pulling.loc, T)))
src.pulling = null
if (src.pulling)
step(src.pulling, get_dir(src.pulling.loc, T))
else
src.pulling = null
. = ..()
code/modules/mob/living/silicon/robot/robot.dm
+9
View File
@@ -277,6 +277,10 @@
src.now_pushing = 1
if (!AM.anchored)
var/t = get_dir(src, AM)
if (istype(AM, /obj/window))
if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST)
for(var/obj/window/win in get_step(AM,t))
return
step(AM, t)
src.now_pushing = null
return
@@ -790,6 +794,11 @@ Frequency:
step(src.pulling, get_dir(src.pulling.loc, T))
M.pulling = t
else
if (src.pulling)
if (istype(src.pulling, /obj/window))
if(src.pulling:ini_dir == NORTHWEST || src.pulling:ini_dir == NORTHEAST || src.pulling:ini_dir == SOUTHWEST || src.pulling:ini_dir == SOUTHEAST)
for(var/obj/window/win in get_step(src.pulling,get_dir(src.pulling.loc, T)))
src.pulling = null
if (src.pulling)
step(src.pulling, get_dir(src.pulling.loc, T))
else