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' into dev

Browse Source 
Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
This commit is contained in:
Chinsky
2014-06-17 16:16:44 +04:00
parent 6823242fa2 08dd01801e
commit be95e54e43
82 changed files with 595 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/defines/obj/weapon.dm
View File

@@ -217,6 +217,7 @@
icon = 'icons/obj/shards.dmi'
icon_state = "large"
sharp = 1
edge = 1
desc = "Could probably be used as ... a throwing weapon?"
w_class = 2.0
force = 5.0