mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 10:21:11 +00:00
bugfixes
fixed poker table sprites looking bad (haven't tested yet so there still may be some shading issues) fixed poker tables mysteriously disappearing on construction fixed glass stacking with plasmaglass fixed being able to walk on solid objects built on tape
This commit is contained in:
@@ -139,6 +139,9 @@
|
|||||||
/obj/item/tape/Bumped(M as mob)
|
/obj/item/tape/Bumped(M as mob)
|
||||||
if(src.allowed(M))
|
if(src.allowed(M))
|
||||||
var/turf/T = get_turf(src)
|
var/turf/T = get_turf(src)
|
||||||
|
for(var/atom/A in T) //Check to see if there's anything solid on the tape's turf (it's possible to build on it)
|
||||||
|
if(A.density)
|
||||||
|
return
|
||||||
M:loc = T
|
M:loc = T
|
||||||
|
|
||||||
/obj/item/tape/CanPass(atom/movable/mover, turf/target, height=1.5, air_group = 0)
|
/obj/item/tape/CanPass(atom/movable/mover, turf/target, height=1.5, air_group = 0)
|
||||||
|
|||||||
@@ -204,7 +204,7 @@
|
|||||||
|
|
||||||
/obj/item/stack/attackby(obj/item/W as obj, mob/user as mob)
|
/obj/item/stack/attackby(obj/item/W as obj, mob/user as mob)
|
||||||
..()
|
..()
|
||||||
if (istype(W, src.type))
|
if (istype(W, src.type) && src.name==W.name)
|
||||||
var/obj/item/stack/S = W
|
var/obj/item/stack/S = W
|
||||||
if (S.amount >= max_amount)
|
if (S.amount >= max_amount)
|
||||||
return 1
|
return 1
|
||||||
|
|||||||
@@ -62,8 +62,8 @@
|
|||||||
Grass.amount -= 1
|
Grass.amount -= 1
|
||||||
else
|
else
|
||||||
del(Grass)
|
del(Grass)
|
||||||
new /obj/item/weapon/table_parts/wood/poker( src.loc )
|
new /obj/item/weapon/table_parts/wood/poker( get_turf(src) )
|
||||||
visible_message("<span class='notice'>[user] adds grass to the wooden table parts</span>")
|
visible_message("<span class='notice'>[user] adds grass to the wooden table parts.</span>")
|
||||||
del(src)
|
del(src)
|
||||||
|
|
||||||
/obj/item/weapon/table_parts/wood/attack_self(mob/user as mob)
|
/obj/item/weapon/table_parts/wood/attack_self(mob/user as mob)
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 175 KiB After Width: | Height: | Size: 175 KiB |
Reference in New Issue
Block a user