From 057d05df91ad6f49b2b540e4e24f6603e9c5b02f Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 13 Dec 2017 10:13:02 -0500 Subject: [PATCH] Merge pull request #33484 from vuonojenmustaturska/eminencefix Fixes glass shard/bananium floor behavior for cameras and ghosts --- code/game/objects/items/stacks/sheets/glass.dm | 4 ++-- code/game/turfs/simulated/floor/mineral_floor.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 290b84e999..0544598246 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -251,7 +251,7 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \ else return ..() -/obj/item/shard/Crossed(mob/AM) - if(istype(AM) && has_gravity(loc)) +/obj/item/shard/Crossed(mob/living/L) + if(istype(L) && has_gravity(loc)) playsound(loc, 'sound/effects/glass_step.ogg', 50, 1) . = ..() diff --git a/code/game/turfs/simulated/floor/mineral_floor.dm b/code/game/turfs/simulated/floor/mineral_floor.dm index 5de453d531..8ad09829b2 100644 --- a/code/game/turfs/simulated/floor/mineral_floor.dm +++ b/code/game/turfs/simulated/floor/mineral_floor.dm @@ -129,10 +129,10 @@ icons = list("bananium","bananium_dam") var/spam_flag = 0 -/turf/open/floor/mineral/bananium/Entered(var/mob/AM) +/turf/open/floor/mineral/bananium/Entered(var/mob/living/L) .=..() if(!.) - if(istype(AM)) + if(istype(L)) squeek() /turf/open/floor/mineral/bananium/attackby(obj/item/W, mob/user, params)