cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14

Browse Source 
# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
This commit is contained in:
Leshana
2018-04-15 14:19:36 -04:00
parent 700c902d14 337e5e7436
commit b5cf8383f6
59 changed files with 1608 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/tables/tables.dm
View File

@@ -176,6 +176,21 @@ var/list/table_icon_cache = list()
visible_message("<span class='danger'>\The [user] tears apart \the [src]!</span>")
src.break_to_parts()
/obj/structure/table/attack_generic(mob/user as mob, var/damage)
if(damage >= 10)
if(reinforced && prob(70))
visible_message("<span class='danger'>\The [user] smashes against \the [src]!</span>")
take_damage(damage/2)
user.do_attack_animation(src)
..()
else
visible_message("<span class='danger'>\The [user] tears apart \the [src]!</span>")
src.break_to_parts()
user.do_attack_animation(src)
return 1
visible_message("<span class='notice'>\The [user] scratches at \the [src]!</span>")
return ..()
/obj/structure/table/MouseDrop_T(obj/item/stack/material/what)
if(can_reinforce && isliving(usr) && (!usr.stat) && istype(what) && usr.get_active_hand() == what && Adjacent(usr))
reinforce_table(what, usr)