cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 20:47:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved para and sleepy pen defines out of weapon.dm.

Browse Source 
Updated flashlight code a little.
Added inhand sprites for desk lamps.
Standardised modules/paperwork.
Decapitalised a bunch of mining items.
Slightly reverted update_icons.dm, so we're not looping through mutations more than we need to. Also, skeletons can now wear lipstick!

A few other things which aren't worth listing individually.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4855 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-10-13 14:37:28 +00:00
parent 92650f1464
commit c4f9b43020
19 changed files with 222 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/handlabeler.dm
+9 -10
View File
@@ -10,7 +10,7 @@
/obj/item/weapon/hand_labeler/afterattack(atom/A, mob/user as mob)
if(!mode) //if it's off, give up.
return
if(A==loc) // if placing the labeller into something (e.g. backpack)
if(A == loc) // if placing the labeller into something (e.g. backpack)
return // don't set a label
if(!labels_left)
@@ -29,22 +29,21 @@
user << "<span class='notice'>You can't label cyborgs.</span>"
return
for(var/mob/M in viewers())
if ((M.client && !( M.blinded )))
M << "\blue [user] labels [A] as [label]."
user.visible_message("<span class='notice'>[user] labels [A] as [label].</span>", \
"<span class='notice'>You label [A] as [label].</span>")
A.name = "[A.name] ([label])"
/obj/item/weapon/hand_labeler/attack_self()
/obj/item/weapon/hand_labeler/attack_self(mob/user as mob)
mode = !mode
icon_state = "labeler[mode]"
if(mode)
usr << "<span class='notice'>You turn on \the [src].</span>"
user << "<span class='notice'>You turn on \the [src].</span>"
//Now let them chose the text.
var/str = copytext(reject_bad_text(input(usr,"Label text?","Set label","")),1,MAX_NAME_LEN)
var/str = copytext(reject_bad_text(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
if(!str || !length(str))
usr << "<span class='notice'>Invalid text.</span>"
user << "<span class='notice'>Invalid text.</span>"
return
label = str
usr << "<span class='notice'>You set the text to '[str]'.</span>"
user << "<span class='notice'>You set the text to '[str]'.</span>"
else
usr << "<span class='notice'>You turn off \the [src].</span>"
user << "<span class='notice'>You turn off \the [src].</span>"