Merge pull request #33484 from vuonojenmustaturska/eminencefix
Fixes glass shard/bananium floor behavior for cameras and ghosts
This commit is contained in:
committed by
CitadelStationBot
parent
a5cd43ae61
commit
057d05df91
@@ -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)
|
||||
. = ..()
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user