shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mobility flags

Browse Source
This commit is contained in:
kevinz000
2020-01-12 11:00:12 -08:00
parent 0fc6d0e891
commit b341818f04
20 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/step_triggers.dm
+4 -4
View File
@@ -61,8 +61,8 @@
if(AM in T.affecting)
return
if(ismob(AM))
var/mob/M = AM
if(isliving(AM))
var/mob/living/M = AM
if(immobilize)
ADD_TRAIT(M, TRAIT_MOBILITY_NOMOVE, src)
M.update_mobility()
@@ -99,8 +99,8 @@
affecting.Remove(AM)
if(ismob(AM))
var/mob/M = AM
if(living(AM))
var/mob/living/M = AM
if(immobilize)
REMOVE_TRAIT(M, TRAIT_MOBILITY_NOMOVE, src)
M.update_mobility()
code/game/objects/items/devices/scanners.dm
+2 -1
View File
@@ -486,7 +486,8 @@ SLIME SCANNER
set name = "Switch Verbosity"
set category = "Object"
if(usr.stat || !usr.canmove || usr.restrained())
var/mob/living/L = usr
if(!istype(L) || !CHECK_MOBILITY(L, MOBILITY_USE))
return
mode = !mode
code/game/objects/structures/crates_lockers/closets.dm
+3 -2
View File
@@ -474,8 +474,9 @@
set category = "Object"
set name = "Toggle Open"
if(!usr.canmove || usr.stat || usr.restrained())
return
var/mob/living/L = usr
if(!istype(L) || !CHECK_MOBILITY(L, MOBILITY_USE))
return FALSE
if(iscarbon(usr) || issilicon(usr) || isdrone(usr))
return attack_hand(usr)
code/game/objects/structures/tables_racks.dm
+1 -2
View File
@@ -549,12 +549,11 @@
/obj/structure/table/optable/tablepush(mob/living/user, mob/living/pushed_mob)
pushed_mob.forceMove(loc)
pushed_mob.set_resting(TRUE, TRUE)
pushed_mob.update_canmove()
visible_message("<span class='notice'>[user] has laid [pushed_mob] on [src].</span>")
check_patient()
/obj/structure/table/optable/proc/check_patient()
var/mob/M = locate(/mob/living/carbon/human, loc)
var/mob/living/carbon/human/M = locate(/mob/living/carbon/human, loc)
if(M)
if(!CHECK_BITFIELD(M.mobility_flags, MOBILITY_STAND))
patient = M
code/game/objects/structures/transit_tubes/station.dm
+3 -3
View File
@@ -43,10 +43,10 @@
//pod insertion
/obj/structure/transit_tube/station/MouseDrop_T(obj/structure/c_transit_tube_pod/R, mob/user)
if(!user.canmove || user.stat || user.restrained())
/obj/structure/transit_tube/station/MouseDrop_T(obj/structure/c_transit_tube_pod/R, mob/living/user)
if(!istype(user) || !CHECK_MOBILLITY(user, MOBILITY_USE))
return
if (!istype(R) || get_dist(user, src) > 1 || get_dist(src,R) > 1)
if(!istype(R) || get_dist(user, src) > 1 || get_dist(src,R) > 1)
return
for(var/obj/structure/transit_tube_pod/pod in loc)
return //no fun allowed