mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-01-06 07:22:42 +00:00
adds permanent markers
also tweaks paint recipe to use ink instead of crayons.
This commit is contained in:
Billy Bangles
@@ -46,11 +46,11 @@
|
||||
if(colour != "#FFFFFF" && shadeColour != "#000000")
|
||||
colour = "#FFFFFF"
|
||||
shadeColour = "#000000"
|
||||
user << "You will now draw in white and black with this crayon."
|
||||
to_chat(usr,"You will now draw in white and black with this crayon.")
|
||||
else
|
||||
colour = "#000000"
|
||||
shadeColour = "#FFFFFF"
|
||||
user << "You will now draw in black and white with this crayon."
|
||||
to_chat(usr,"You will now draw in black and white with this crayon.")
|
||||
return
|
||||
|
||||
/obj/item/weapon/pen/crayon/rainbow
|
||||
@@ -72,22 +72,22 @@
|
||||
switch(drawtype)
|
||||
if("letter")
|
||||
drawtype = input("Choose the letter.", "Crayon scribbles") in list("a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z")
|
||||
user << "You start drawing a letter on the [target.name]."
|
||||
to_chat(usr,"You start drawing a letter on the [target.name].")
|
||||
if("graffiti")
|
||||
user << "You start drawing graffiti on the [target.name]."
|
||||
to_chat(usr,"You start drawing graffiti on the [target.name].")
|
||||
if("rune")
|
||||
user << "You start drawing a rune on the [target.name]."
|
||||
to_chat(usr,"You start drawing a rune on the [target.name].")
|
||||
if("arrow")
|
||||
drawtype = input("Choose the arrow.", "Crayon scribbles") in list("left", "right", "up", "down")
|
||||
user << "You start drawing an arrow on the [target.name]."
|
||||
to_chat(usr,"You start drawing an arrow on the [target.name].")
|
||||
if(instant || do_after(user, 50))
|
||||
new /obj/effect/decal/cleanable/crayon(target,colour,shadeColour,drawtype)
|
||||
user << "You finish drawing."
|
||||
to_chat(usr,"You finish drawing.")
|
||||
target.add_fingerprint(user) // Adds their fingerprints to the floor the crayon is drawn on.
|
||||
if(uses)
|
||||
uses--
|
||||
if(!uses)
|
||||
user << "<span class='warning'>You used up your crayon!</span>"
|
||||
to_chat(usr,"<span class='warning'>You used up your crayon!</span>")
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
@@ -99,7 +99,93 @@
|
||||
if(uses)
|
||||
uses -= 5
|
||||
if(uses <= 0)
|
||||
user << "<span class='warning'>You ate your crayon!</span>"
|
||||
to_chat(user,"<span class='warning'>You ate your crayon!</span>")
|
||||
qdel(src)
|
||||
else
|
||||
..()
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/black
|
||||
icon_state = "markerblack"
|
||||
colour = "#2D2D2D"
|
||||
shadeColour = "#000000"
|
||||
colourName = "black"
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/red
|
||||
icon_state = "markerred"
|
||||
colour = "#DA0000"
|
||||
shadeColour = "#810C0C"
|
||||
colourName = "red"
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/orange
|
||||
icon_state = "markerorange"
|
||||
colour = "#FF9300"
|
||||
shadeColour = "#A55403"
|
||||
colourName = "orange"
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/yellow
|
||||
icon_state = "markeryellow"
|
||||
colour = "#FFF200"
|
||||
shadeColour = "#886422"
|
||||
colourName = "yellow"
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/green
|
||||
icon_state = "markergreen"
|
||||
colour = "#A8E61D"
|
||||
shadeColour = "#61840F"
|
||||
colourName = "green"
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/blue
|
||||
icon_state = "markerblue"
|
||||
colour = "#00B7EF"
|
||||
shadeColour = "#0082A8"
|
||||
colourName = "blue"
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/purple
|
||||
icon_state = "markerpurple"
|
||||
colour = "#DA00FF"
|
||||
shadeColour = "#810CFF"
|
||||
colourName = "purple"
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/mime
|
||||
icon_state = "markermime"
|
||||
desc = "A very sad-looking marker."
|
||||
colour = "#FFFFFF"
|
||||
shadeColour = "#000000"
|
||||
colourName = "mime"
|
||||
uses = 0
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/mime/attack_self(mob/living/user as mob) //inversion
|
||||
if(colour != "#FFFFFF" && shadeColour != "#000000")
|
||||
colour = "#FFFFFF"
|
||||
shadeColour = "#000000"
|
||||
to_chat(usr,"You will now draw in white and black with this marker.")
|
||||
else
|
||||
colour = "#000000"
|
||||
shadeColour = "#FFFFFF"
|
||||
to_chat(usr,"You will now draw in black and white with this marker.")
|
||||
return
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/rainbow
|
||||
icon_state = "markerrainbow"
|
||||
colour = "#FFF000"
|
||||
shadeColour = "#000FFF"
|
||||
colourName = "rainbow"
|
||||
uses = 0
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/rainbow/attack_self(mob/living/user as mob)
|
||||
colour = input(user, "Please select the main colour.", "Marker colour") as color
|
||||
shadeColour = input(user, "Please select the shade colour.", "Marker colour") as color
|
||||
return
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/attack(mob/M as mob, mob/user as mob)
|
||||
if(M == user)
|
||||
to_chat(usr,"You take a bite of the marker and swallow it.")
|
||||
user.nutrition += 1
|
||||
user.reagents.add_reagent("marker_ink",6)
|
||||
if(uses)
|
||||
uses -= 5
|
||||
if(uses <= 0)
|
||||
to_chat(user,"<span class='warning'>You ate the marker!</span>")
|
||||
qdel(src)
|
||||
else
|
||||
..()
|
||||
@@ -114,6 +114,48 @@
|
||||
return
|
||||
..()
|
||||
|
||||
/obj/item/weapon/storage/fancy/markers
|
||||
name = "box of markers"
|
||||
desc = "A very professional looking box of permanent markers."
|
||||
icon = 'icons/obj/crayons.dmi'
|
||||
icon_state = "markerbox"
|
||||
w_class = ITEMSIZE_SMALL
|
||||
icon_type = "marker"
|
||||
can_hold = list(
|
||||
/obj/item/weapon/pen/crayon/marker
|
||||
)
|
||||
starts_with = list(
|
||||
/obj/item/weapon/pen/crayon/marker/black,
|
||||
/obj/item/weapon/pen/crayon/marker/red,
|
||||
/obj/item/weapon/pen/crayon/marker/orange,
|
||||
/obj/item/weapon/pen/crayon/marker/yellow,
|
||||
/obj/item/weapon/pen/crayon/marker/green,
|
||||
/obj/item/weapon/pen/crayon/marker/blue,
|
||||
/obj/item/weapon/pen/crayon/marker/purple
|
||||
)
|
||||
|
||||
/obj/item/weapon/storage/fancy/markers/initialize()
|
||||
. = ..()
|
||||
update_icon()
|
||||
|
||||
/obj/item/weapon/storage/fancy/markers/update_icon()
|
||||
var/mutable_appearance/ma = new(src)
|
||||
ma.overlays = list()
|
||||
for(var/obj/item/weapon/pen/crayon/marker/marker in contents)
|
||||
ma.overlays += image('icons/obj/crayons.dmi',"m"+marker.colourName)
|
||||
appearance = ma
|
||||
|
||||
/obj/item/weapon/storage/fancy/markers/attackby(obj/item/W as obj, mob/user as mob)
|
||||
if(istype(W,/obj/item/weapon/pen/crayon/marker))
|
||||
switch(W:colourName)
|
||||
if("mime")
|
||||
to_chat(usr,"This marker is too depressing to be contained in this box.")
|
||||
return
|
||||
if("rainbow")
|
||||
to_chat(usr,"This marker is too childish to be contained in this box.")
|
||||
return
|
||||
..()
|
||||
|
||||
////////////
|
||||
//CIG PACK//
|
||||
////////////
|
||||
@@ -253,15 +295,17 @@
|
||||
reagents.trans_to_obj(C, (reagents.total_volume/contents.len))
|
||||
..()
|
||||
|
||||
/obj/item/weapon/storage/rollingpapers
|
||||
/obj/item/weapon/storage/fancy/rollingpapers
|
||||
name = "rolling paper pack"
|
||||
desc = "A small cardboard pack containing several folded rolling papers."
|
||||
icon_state = "paperbox"
|
||||
icon = 'icons/obj/cigarettes.dmi'
|
||||
w_class = ITEMSIZE_TINY
|
||||
throwforce = 1
|
||||
throwforce = 2
|
||||
slot_flags = SLOT_BELT
|
||||
storage_slots = 14
|
||||
can_hold = list(/obj/item/weapon/rollingpaper)
|
||||
icon_type = "paper"
|
||||
starts_with = list(/obj/item/weapon/rollingpaper = 14)
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user