TG: Added checks for the player being dead, stunned, unconcious ect... to:

- Timers
- Remote Signallers (Fixes  issue 325 )
- Proximity Sensors
- Infared Sensors (Man.. these really need to be fixed.. or just re-done
entierly)

Cargo shuttle:
- People in the area of the cargo shuttle get gibbed when the shuttle shows up.
(Fixes  issue 508 )
- Renamed 'Dock' to 'Away' because Station -> Dock is confusing...

Committing for Sieve:
- The toggle throw hotkey (end) now works with TK (Fixes  issue 523 )
- Borg diamond drills now properly dig sand (I still don't understand why they
don't just have a shovel...)

Updated changelog to reflect some of these changes.
Revision: r3747
Author: 	 johnsonmt88
This commit is contained in:
Erthilo
2012-06-14 17:15:58 +01:00
parent a278b7c29f
commit c4ad66d972
8 changed files with 30 additions and 27 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/obj/item/device/assembly/infra
name = "Infrared Beam"
@@ -129,7 +129,7 @@
Topic(href, href_list)
..()
if(get_dist(src, usr) > 1)
if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
usr << browse(null, "window=infra")
onclose(usr, "infra")
return
+2 -3
View File
@@ -1,4 +1,4 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/obj/item/device/assembly/prox_sensor
name = "proximity sensor"
@@ -100,7 +100,6 @@
M.c_state(0)
if(holder)
holder.update_icon()
return
@@ -127,7 +126,7 @@
Topic(href, href_list)
..()
if(get_dist(src, usr) > 1)
if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
usr << browse(null, "window=prox")
onclose(usr, "prox")
return
+4 -4
View File
@@ -1,4 +1,4 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/obj/item/device/assembly/signaler
name = "Remote Signaling Device"
@@ -77,9 +77,9 @@
Topic(href, href_list)
..()
if(get_dist(src, usr) > 1)
usr << browse(null, "window=signal")
onclose(usr, "signal")
if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
usr << browse(null, "window=radio")
onclose(usr, "radio")
return
if (href_list["freq"])
+2 -2
View File
@@ -1,4 +1,4 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/obj/item/device/assembly/timer
name = "timer"
@@ -93,7 +93,7 @@
Topic(href, href_list)
..()
if(get_dist(src, usr) > 1)
if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
usr << browse(null, "window=timer")
onclose(usr, "timer")
return
+1 -1
View File
@@ -345,7 +345,7 @@
else
..(W,user)
if ((istype(W,/obj/item/weapon/pickaxe/diamonddrill)))
if ((istype(W,/obj/item/weapon/pickaxe/diamonddrill)) || (istype(W,/obj/item/weapon/pickaxe/borgdrill)))
var/turf/T = user.loc
if (!( istype(T, /turf) ))
return
+7 -8
View File
@@ -40,10 +40,7 @@
/client/Southwest()
if(iscarbon(usr))
var/mob/living/carbon/C = usr
if(!C.get_active_hand())
usr << "\red You have nothing in your hand to throw."
return
toggle_throw_mode()
C.toggle_throw_mode()
else
usr << "\red This mob type cannot throw items."
return
@@ -132,10 +129,12 @@
/client/verb/toggle_throw_mode()
set hidden = 1
if(!istype(mob, /mob/living/carbon)) return
if((mob.stat || mob.restrained()) || !(isturf(mob.loc))) return
mob:toggle_throw_mode()
return
if(!istype(mob, /mob/living/carbon))
return
if (!mob.stat && isturf(mob.loc) && !mob.restrained())
mob:toggle_throw_mode()
else
return
/client/verb/drop_item()