cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-29 15:06:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
PsiOmega
2015-09-27 13:48:33 +02:00
parent d1e2257218 07f03ca978
commit 63de1764c3
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.dm
+3 -3
View File
@@ -4,13 +4,13 @@
*/
/obj/item/weapon/paper
name = "paper"
gender = PLURAL
name = "sheet of paper"
gender = NEUTER
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "paper"
item_state = "paper"
throwforce = 0
w_class = 1.0
w_class = 1
throw_range = 1
throw_speed = 1
layer = 4
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"