cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6885 from Probe1/Chisel_Improvements

Browse Source 
Chisel improvements for #6882
This commit is contained in:
Rob Nelson
2015-12-06 15:06:38 -08:00
parent ba91692085 bd9863e00b
commit f7f2783829
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/game/objects/items/weapons/chisel.dm
View File

@@ -37,8 +37,21 @@
var/turf/simulated/wall/W = target var/turf/simulated/wall/W = target
W.add_fingerprint(user) W.add_fingerprint(user)
if(!W.engraving) if(!W.engraving)
var/engraving_name = sanitize(input(usr, "Depicted on the wall is an image of ...","Basic engraving") as text) var/engraving_name = sanitize(input(usr, "Depicted on the wall is an image of ...", "Basic engraving", null) as null | text)
var/engraving = sanitize(input(usr, "Depicted on the wall is an image of [engraving_name]. ...","Details of the engraving") as text) if(!engraving_name) return
var/engraving = sanitize(input(usr, "Depicted on the wall is an image of [engraving_name]. ...","Details of the engraving", null) as null | text)
if(!engraving) return
var/list/engravings = list("Amyjon"="amyjon", "Face"="face", "Matt wuz here"="matt", "Vive la Revolution"="revolution", "Engi"="engie", "Killroy"="guy", "End is nigh"= "end", "Dorf"="dwarf", "Uboa"="uboa")
var/engravingdesign = input("Your engraving", null)as null|anything in engravings
if(!engravingdesign) return
var/engraving_icon_state = engravings[engravingdesign]
//Get icon
var/icon/engraving_overlay = new/icon('icons/effects/crayondecal.dmi',"[engraving_icon_state]",2.1)
user.visible_message("<span class='notice'>[user.name] starts engraving something on the [W.name].</span>", "<span class='notice'>You start engraving an image of [engraving_name] on the [W.name].</span>") user.visible_message("<span class='notice'>[user.name] starts engraving something on the [W.name].</span>", "<span class='notice'>You start engraving an image of [engraving_name] on the [W.name].</span>")
if(do_after(user, target, 60)) if(do_after(user, target, 60))
@@ -61,10 +74,7 @@
W.engraving_quality = "a <span class='notice'>masterfully designed</span>" W.engraving_quality = "a <span class='notice'>masterfully designed</span>"
to_chat(user, "<span class='warning'>It's a masterpiece!</span>") to_chat(user, "<span class='warning'>It's a masterpiece!</span>")
engraving = {"Depicted on the wall is [W.engraving_quality] image of [engraving_name][(use_name ? " by [user.real_name]" : "")]. [engraving]"} engraving = {"Depicted on the wall is [W.engraving_quality] image of [engraving_name][(use_name ? " by [user.real_name]" : "")]. [engraving]."}
var/icon/overlay_type = pick("amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa")
var/icon/engraving_overlay = new/icon('icons/effects/crayondecal.dmi',"[overlay_type]",2.1)
W.overlays += engraving_overlay W.overlays += engraving_overlay
W.engraving = engraving W.engraving = engraving