cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Crossed/Entered/Exited/Bump/ui_act parameter casting (#49016)

Browse Source 
About The Pull Request

Detected as part of my work on SpaceManiac/SpacemanDMM#167
This commit is contained in:
spookydonut
2020-01-28 10:51:15 +13:00
committed by oranges
parent b7aa7ef4b4
commit ac7f2b5166
25 changed files with 84 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/anomalies.dm
+7 -7
View File
@@ -103,10 +103,10 @@
if(target && !target.stat)
O.throw_at(target, 5, 10)
/obj/effect/anomaly/grav/Crossed(mob/A)
gravShock(A)
/obj/effect/anomaly/grav/Crossed(atom/movable/AM)
gravShock(AM)
/obj/effect/anomaly/grav/Bump(mob/A)
/obj/effect/anomaly/grav/Bump(atom/A)
gravShock(A)
/obj/effect/anomaly/grav/Bumped(atom/movable/AM)
@@ -149,11 +149,11 @@
for(var/mob/living/M in range(0, src))
mobShock(M)
/obj/effect/anomaly/flux/Crossed(mob/living/M)
mobShock(M)
/obj/effect/anomaly/flux/Crossed(atom/movable/AM)
mobShock(AM)
/obj/effect/anomaly/flux/Bump(mob/living/M)
mobShock(M)
/obj/effect/anomaly/flux/Bump(atom/A)
mobShock(A)
/obj/effect/anomaly/flux/Bumped(atom/movable/AM)
mobShock(AM)
code/game/objects/effects/decals/cleanable/humans.dm
+2 -2
View File
@@ -74,8 +74,8 @@
/obj/effect/decal/cleanable/blood/gibs/ex_act(severity, target)
return
/obj/effect/decal/cleanable/blood/gibs/Crossed(mob/living/L)
if(istype(L) && has_gravity(loc))
/obj/effect/decal/cleanable/blood/gibs/Crossed(atom/movable/L)
if(isliving(L) && has_gravity(loc))
playsound(loc, 'sound/effects/gib_step.ogg', HAS_TRAIT(L, TRAIT_LIGHT_STEP) ? 20 : 50, TRUE)
. = ..()
code/game/objects/items.dm
+1 -1
View File
@@ -263,7 +263,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
add_fingerprint(user)
ui_interact(user)
/obj/item/ui_act(action, params)
/obj/item/ui_act(action, list/params)
add_fingerprint(usr)
return ..()
code/game/objects/items/implants/implant_stealth.dm
+1 -1
View File
@@ -35,7 +35,7 @@
alpha = 255
addtimer(CALLBACK(src, .proc/go_invisible), 10, TIMER_OVERRIDE|TIMER_UNIQUE)
/obj/structure/closet/cardboard/agent/Bump(atom/movable/A)
/obj/structure/closet/cardboard/agent/Bump(atom/A)
. = ..()
if(isliving(A))
reveal()
code/game/objects/items/stacks/sheets/glass.dm
+5 -3
View File
@@ -330,9 +330,11 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
qdel(src)
return TRUE
/obj/item/shard/Crossed(mob/living/L)
if(istype(L) && !(L.is_flying() || L.is_floating() || L.buckled))
playsound(src, 'sound/effects/glass_step.ogg', HAS_TRAIT(L, TRAIT_LIGHT_STEP) ? 30 : 50, TRUE)
/obj/item/shard/Crossed(atom/movable/AM)
if(isliving(AM))
var/mob/living/L = AM
if(!(L.is_flying() || L.is_floating() || L.buckled))
playsound(src, 'sound/effects/glass_step.ogg', HAS_TRAIT(L, TRAIT_LIGHT_STEP) ? 30 : 50, TRUE)
return ..()
/obj/item/shard/plasma
code/game/objects/items/stacks/stack.dm
+3 -3
View File
@@ -377,9 +377,9 @@
S.add(transfer)
return transfer
/obj/item/stack/Crossed(obj/o)
if(istype(o, merge_type) && !o.throwing)
merge(o)
/obj/item/stack/Crossed(atom/movable/AM)
if(istype(AM, merge_type) && !AM.throwing)
merge(AM)
. = ..()
/obj/item/stack/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
code/game/objects/structures/stairs.dm
+1 -1
View File
@@ -53,7 +53,7 @@
if(S)
S.update_icon()
/obj/structure/stairs/Uncross(atom/movable/AM, turf/newloc)
/obj/structure/stairs/Uncross(atom/movable/AM, atom/newloc)
if(!newloc || !AM)
return ..()
if(!isobserver(AM) && isTerminator() && (get_dir(src, newloc) == dir))