From 37e8cd977d36dfc545f844f73bb1baf652a89bf6 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Tue, 12 Dec 2017 17:43:46 +0200 Subject: [PATCH 1/2] Fixed glass shard Crossed() behavior for cameras and ghosts --- code/game/objects/items/stacks/sheets/glass.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 290b84e9998..05445982461 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) . = ..() From 92bb7828e3940da6b3dd0d0b3fd4932f88dad038 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Tue, 12 Dec 2017 17:49:07 +0200 Subject: [PATCH 2/2] Update mineral_floor.dm --- code/game/turfs/simulated/floor/mineral_floor.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/turfs/simulated/floor/mineral_floor.dm b/code/game/turfs/simulated/floor/mineral_floor.dm index 5de453d531b..8ad09829b24 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)