TG Updates: Fixes: Issue 241 Issue 237 and Issue 240

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2708 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
quartz235@gmail.com
2011-12-17 00:14:11 +00:00
committed by Hawk-v3
parent d5e55883fd
commit 5f9fa90a90
3 changed files with 7 additions and 1 deletions

View File

@@ -17,7 +17,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
anchored = 1 anchored = 1
Bump(atom/clong) Bump(atom/clong)
if (istype(clong, /turf)) if (istype(clong, /turf) && !istype(clong, /turf/simulated/shuttle) && !istype(clong, /turf/unsimulated))
if(clong.density) if(clong.density)
clong.ex_act(2) clong.ex_act(2)
for (var/mob/O in hearers(src, null)) for (var/mob/O in hearers(src, null))
@@ -32,6 +32,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
clong.meteorhit(src) clong.meteorhit(src)
if(clong && prob(25)) if(clong && prob(25))
src.loc = clong.loc src.loc = clong.loc
else del(src)
/proc/immovablerod() /proc/immovablerod()

View File

@@ -19,6 +19,8 @@ SHARDS
title += " ([src.amount] sheet\s left)" title += " ([src.amount] sheet\s left)"
switch(alert(title, "Would you like full tile glass or one direction?", "one direct", "full (2 sheets)", "cancel", null)) switch(alert(title, "Would you like full tile glass or one direction?", "one direct", "full (2 sheets)", "cancel", null))
if("one direct") if("one direct")
if (src.loc != usr)
return 1
if (src.amount < 1) if (src.amount < 1)
return 1 return 1
var/list/directions = new/list(cardinal) var/list/directions = new/list(cardinal)
@@ -52,6 +54,8 @@ SHARDS
W.anchored = 0 W.anchored = 0
src.use(1) src.use(1)
if("full (2 sheets)") if("full (2 sheets)")
if (src.loc != usr)
return 1
if (src.amount < 2) if (src.amount < 2)
return 1 return 1
if (locate(/obj/structure/window) in usr.loc) if (locate(/obj/structure/window) in usr.loc)

View File

@@ -859,6 +859,7 @@
else else
src.malfai = usr src.malfai = usr
malfai << "Hack complete. The APC is now under your exclusive control." malfai << "Hack complete. The APC is now under your exclusive control."
updateicon()
else if (href_list["occupyapc"]) else if (href_list["occupyapc"])
malfoccupy(usr) malfoccupy(usr)