verb guacamole

This commit is contained in:
9600bauds
2015-05-07 19:41:33 -03:00
parent ab20d9711e
commit f3021845b8
4 changed files with 38 additions and 11 deletions

View File

@@ -39,7 +39,6 @@
update_icon()
updateinfolinks()
return
verbs -= /obj/item/weapon/paper/verb/wipe_color
/obj/item/weapon/paper/update_icon()
icon_state=initial(icon_state)
@@ -378,15 +377,6 @@ var/global/list/paper_folding_results = list ( \
return 0
return 1
/obj/item/weapon/paper/verb/wipe_color() //since we don't have erasers or anything
set name = "Wipe coloring"
set category = "Object"
set src in usr
if(src.color)
usr << "<span class='notice'>You wipe the color off the [src.name].</span>"
src.color = null
src.verbs -= /obj/item/weapon/paper/verb/wipe_color
/*
* Premade paper
*/

View File

@@ -33,7 +33,6 @@
var/obj/item/toy/crayon/C = I
src.color = C.colour //doesn't work with paper hats but I haven't found a way to fix it, who will even notice anyways
src.unfolded.color = C.colour
src.unfolded.verbs += /obj/item/weapon/paper/verb/wipe_color
else if(I.is_hot())
src.burn_paper(user)
return

View File

@@ -1472,6 +1472,8 @@
else
if(O)
O.clean_blood()
if(O.color && istype(O, /obj/item/weapon/paper))
O.color = null
/datum/reagent/space_cleaner/reaction_turf(var/turf/T, var/volume)
if(volume >= 1)

View File

@@ -0,0 +1,36 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscdel (general adding of nice things)
# rscadd (general deleting of nice things)
# imageadd
# imagedel
# spellcheck (typo fixes)
# experiment
# tgs (TG-ported fixes?)
#################################
# Your name.
author: 9600bauds
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
changes:
- rscadd: You can now fold paper into paper planes, origami etc. by using the "Fold paper" verb in the rightclick menu.
- rscadd: You can also get rid of paper by burning it with a lighter or similar.