cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-19 04:08:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge with dev.

Browse Source
This commit is contained in:
Zuhayr
2014-06-12 01:14:40 +09:30
parent 1f7a9355f8 06154d4d8d
commit 136ccc347b
79 changed files with 915 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/Chinsky/ashtray.dm
+3 -4
View File
@@ -82,8 +82,7 @@
icon_broken = "ashtray_bork_bl"
max_butts = 14
health = 24.0
g_amt = 30
m_amt = 30
matter = list("metal" = 30,"glass" = 30)
empty_desc = "Cheap plastic ashtray."
throwforce = 3.0
die()
@@ -103,7 +102,7 @@
icon_broken = "ashtray_bork_br"
max_butts = 10
health = 72.0
m_amt = 80
matter = list("metal" = 80)
empty_desc = "Massive bronze ashtray."
throwforce = 10.0
@@ -124,7 +123,7 @@
icon_broken = "ashtray_bork_gl"
max_butts = 12
health = 12.0
g_amt = 60
matter = list("glass" = 60)
empty_desc = "Glass ashtray. Looks fragile."
throwforce = 6.0