From fb9acbaa083cf50bc707f5fe86382e5b5d6ff0ea Mon Sep 17 00:00:00 2001 From: sick-trigger Date: Tue, 29 May 2012 13:56:36 +1000 Subject: [PATCH 1/3] Actually fixes digging sand messages --- code/modules/mining/mine_turfs.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index bd80e25149c..c9fcec5e234 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -316,6 +316,8 @@ icon_plating = "asteroid_dug" icon_state = "asteroid_dug" return + else + return else ..(W,user) if ((istype(W,/obj/item/weapon/pickaxe/drill))) @@ -337,6 +339,9 @@ dug = 1 icon_plating = "asteroid_dug" icon_state = "asteroid_dug" + return + else + return else ..(W,user) @@ -359,6 +364,9 @@ dug = 1 icon_plating = "asteroid_dug" icon_state = "asteroid_dug" + return + else + return else ..(W,user) From 2b43fd81b82f0f4320db88069e120e4ce989480d Mon Sep 17 00:00:00 2001 From: sick-trigger Date: Tue, 29 May 2012 20:29:54 +1000 Subject: [PATCH 2/3] Allows you to teleport while disguised as a banana. --- code/game/machinery/teleporter.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 82b19052d4a..1fec2e76069 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -130,10 +130,6 @@ O.show_message("\red Failure: Cannot authenticate locked on coordinates. Please reinstate coordinate matrix.") return if (istype(M, /atom/movable)) - if (istype(M, /obj/effect/dummy/chameleon)) - for(var/mob/C in M) - C << "\red The projection field prevents you from entering!" - return if(prob(5) && !accurate) //oh dear a problem, put em in deep space do_teleport(M, locate(rand(5, world.maxx - 5), rand(5, world.maxy - 5), 3), 2) else From 83e37be05701f293f8ecb308e9f3493b1792001a Mon Sep 17 00:00:00 2001 From: sick-trigger Date: Tue, 29 May 2012 20:31:36 +1000 Subject: [PATCH 3/3] Allows you to teleport while disguised as a banana. --- code/datums/helper_datums/teleport.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index 6f0bbe3aebc..8b93f01736d 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -52,7 +52,7 @@ //must succeed in most cases proc/setTeleatom(atom/movable/ateleatom) - if(istype(ateleatom, /obj/effect)) + if(istype(ateleatom, /obj/effect) && !istype(ateleatom, /obj/effect/dummy/chameleon)) del(ateleatom) return 0 if(istype(ateleatom))