cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 15:37:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into HolidayDatums

Browse Source 
Conflicts:
	code/__DEFINES/misc.dm
This commit is contained in:
Tigercat2000
2015-05-16 18:40:54 -07:00
parent 3d9fd8d6a0 23a510b743
commit 0a66ac4ba5
177 changed files with 4385 additions and 2397 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/pen.dm
+15
View File
@@ -47,6 +47,21 @@
icon_state = "pen"
colour = "white"
/obj/item/weapon/pen/multi //spaceman96: Trenna Seber
name = "multicolor pen"
desc = "It's a cool looking pen. Lots of colors!"
/obj/item/weapon/pen/fancy
name = "fancy pen"
desc = "A fancy metal pen. It uses blue ink. An inscription on one side reads,\"L.L. - L.R.\""
icon = 'icons/obj/custom_items.dmi'
icon_state = "fancypen"
/obj/item/weapon/pen/gold
name = "Gilded Pen"
desc = "A golden pen that is gilded with a meager amount of gold material. The word 'Nanotrasen' is etched on the clip of the pen."
icon = 'icons/obj/custom_items.dmi'
icon_state = "eugene_pen"
/obj/item/weapon/pen/attack(mob/living/M, mob/user)
if(!istype(M))