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

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/spells/artifacts.dm
This commit is contained in:
PsiOmega
2015-09-27 13:36:56 +02:00
parent 095f2c520d c3d6fd07fd
commit 807e7bf954
9 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/paper_bundle.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/item/weapon/paper_bundle
name = "paper bundle"
gender = PLURAL
gender = NEUTER
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "paper"
item_state = "paper"