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

CHECK_MOBILITY

Browse Source
This commit is contained in:
kevinz000
2020-03-03 20:40:33 -07:00
parent 1e99cd0bfe
commit 8b0b685fa7
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/flags.dm
+1 -1
View File
@@ -95,7 +95,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
//Mob mobility var flags
/// any flag
#define CHECK_MOBILITY(target, flags) CHECK_BITFIELD(target.mobility_flags, flags)
#define CHECK_MOBILITY(target, flags) CHECK_MOBILITY(target, flags)
#define CHECK_ALL_MOBILITY(target, flags) CHECK_MULTIPLE_BITFIELDS(target.mobility_flags, flags)
/// can move
code/game/machinery/dance_machine.dm
+1 -1
View File
@@ -433,5 +433,5 @@
. = ..()
if(active)
for(var/mob/living/M in rangers)
if(prob(5+(allowed(M)*4)) && CHECK_BITFIELD(M.mobility_flags, MOBILITY_MOVE))
if(prob(5+(allowed(M)*4)) && CHECK_MOBILITY(M, MOBILITY_MOVE))
dance(M)
code/game/machinery/pipe/pipe_dispenser.dm
+1 -1
View File
@@ -95,7 +95,7 @@
//Allow you to drag-drop disposal pipes and transit tubes into it
/obj/machinery/pipedispenser/disposal/MouseDrop_T(obj/structure/pipe, mob/living/user)
if(!istype(user) || !CHECK_BITFIELD(user.mobility_flags, MOBILITY_USE))
if(!istype(user) || !CHECK_MOBILITY(user, MOBILITY_USE))
return
if (!istype(pipe, /obj/structure/disposalconstruct) && !istype(pipe, /obj/structure/c_transit_tube) && !istype(pipe, /obj/structure/c_transit_tube_pod))
code/game/objects/items/storage/bags.dm
+1 -1
View File
@@ -247,7 +247,7 @@
set category = "Object"
set desc = "Activate to convert your plants into plantable seeds."
var/mob/living/L = usr
if(istype(L) && !CHECK_BITFIELD(L.mobility_flags, MOBILITY_USE))
if(istype(L) && !CHECK_MOBILITY(L, MOBILITY_USE))
return
for(var/obj/item/O in contents)
seedify(O, 1)
code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+1 -1
View File
@@ -19,7 +19,7 @@
var/use_mob_movespeed = FALSE //Citadel adds snowflake box handling
/obj/structure/closet/cardboard/relaymove(mob/living/user, direction)
if(opened || move_delay || !CHECK_BITFIELD(user.mobility_flags, MOBILITY_MOVE) || !isturf(loc) || !has_gravity(loc))
if(opened || move_delay || !CHECK_MOBILITY(user, MOBILITY_MOVE) || !isturf(loc) || !has_gravity(loc))
return
move_delay = TRUE
var/oldloc = loc
code/game/objects/structures/tables_racks.dm
+2 -2
View File
@@ -137,7 +137,7 @@
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "table", /datum/mood_event/table)
/obj/structure/table/shove_act(mob/living/target, mob/living/user)
if(CHECK_BITFIELD(target.mobility_flags, MOBILITY_STAND))
if(CHECK_MOBILITY(target, MOBILITY_STAND))
target.DefaultCombatKnockdown(SHOVE_KNOCKDOWN_TABLE)
user.visible_message("<span class='danger'>[user.name] shoves [target.name] onto \the [src]!</span>",
"<span class='danger'>You shove [target.name] onto \the [src]!</span>", null, COMBAT_MESSAGE_RANGE)
@@ -575,7 +575,7 @@
/obj/structure/table/optable/proc/check_patient()
var/mob/living/carbon/human/M = locate(/mob/living/carbon/human, loc)
if(M)
if(!CHECK_BITFIELD(M.mobility_flags, MOBILITY_STAND))
if(!CHECK_MOBILITY(M, MOBILITY_STAND))
patient = M
return 1
else