cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-22 04:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

Browse Source
This commit is contained in:
Aurorablade
2016-09-01 00:43:50 -04:00
parent d806d986ef 9bbd2b0037
commit 2c104adaf3
125 changed files with 410 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/tables_racks.dm
+2 -2
View File
@@ -215,7 +215,7 @@
G.affecting.Weaken(2)
G.affecting.visible_message("<span class='danger'>[G.assailant] pushes [G.affecting] onto [src].</span>", \
"<span class='userdanger'>[G.assailant] pushes [G.affecting] onto [src].</span>")
add_logs(G.affecting, G.assailant, "pushed onto a table")
add_logs(G.assailant, G.affecting, "pushed onto a table")
qdel(I)
return 1
qdel(I)
@@ -643,4 +643,4 @@
icon_state = "minibar_left"
/obj/structure/rack/skeletal_bar/right
icon_state = "minibar_right"
icon_state = "minibar_right"