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

Merge pull request #17336 from coiax/coiax-fixes-things

Browse Source 
Glass tables break more, Metastation HoP hat fix
This commit is contained in:
Joan Lung
2016-05-04 07:36:37 -04:00
parent 85eeef9a4c 8a3776cc61
commit 09b6caeb0e
4 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/tables_racks.dm
+19 -15
View File
@@ -264,23 +264,27 @@
canSmoothWith = null
health = 50
/obj/structure/table/glass/tablepush(obj/item/I, mob/user)
if(..())
visible_message("<span class='warning'>[src] breaks!</span>")
playsound(src.loc, "shatter", 50, 1)
new frame(src.loc)
new /obj/item/weapon/shard(src.loc)
qdel(src)
/obj/structure/table/glass/Crossed(atom/movable/AM)
. = ..()
if(flags & NODECONSTRUCT)
return
// Don't break if they're just flying past
if(AM.throwing)
return
if(istype(AM, /mob/living))
var/mob/living/M = AM
if(has_gravity(M) && M.mob_size > MOB_SIZE_SMALL)
table_shatter(M)
/obj/structure/table/glass/climb_structure(mob/user)
if(..())
visible_message("<span class='warning'>[src] breaks!</span>")
playsound(src.loc, "shatter", 50, 1)
new frame(src.loc)
new /obj/item/weapon/shard(src.loc)
qdel(src)
user.Weaken(5)
/obj/structure/table/glass/proc/table_shatter(mob/M)
visible_message("<span class='warning'>[src] breaks!</span>")
playsound(src.loc, "shatter", 50, 1)
new frame(src.loc)
var/obj/item/weapon/shard/S = new(src.loc)
S.throw_impact(M)
M.Weaken(5)
qdel(src)
/*
* Wooden tables