cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-14 17:45:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Four-color pen code improvement.

Browse Source 
Take advantage of inheritance; use defaults instead of New()
This commit is contained in:
octareenroon91
2015-11-17 13:07:22 -06:00
parent a33df9b39b
commit 33350bffe6
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/pen.dm
+4 -11
View File
@@ -45,16 +45,9 @@
colour = "white"
/obj/item/weapon/pen/fourcolor
desc = "It's a fancy four-color ink pen."
desc = "It's a fancy four-color ink pen, set to black."
name = "four-color pen"
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "pen"
item_state = "pen"
/obj/item/weapon/pen/fourcolor/New()
..()
colour = "black"
desc = "It's a fancy four-color ink pen, set to [src.colour]."
/obj/item/weapon/pen/fourcolor/attack_self(mob/living/carbon/user)
switch(colour)
@@ -66,9 +59,9 @@
colour = "blue"
else
colour = "black"
user << "<span class='notice'>[src] will now write in [src.colour].</span>"
//user << "<span class='notice'>[src] will now write in <span style='color=[colour]'>[colour]</span>.</span>" // If anyone feels lucky
desc = "It's a fancy four-color ink pen, set to [src.colour]."
user << "<span class='notice'>[src] will now write in [colour].</span>"
//user << "<span class='notice'>[src] will now write in <font style='color=[colour]'>[colour]</font>.</span>"
desc = "It's a fancy four-color ink pen, set to [colour]."
/obj/item/weapon/pen/attack(mob/living/M, mob/user,stealth)
if(!istype(M))