cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15863 from ppi13/look-maa-i-can-fit-8-crayons-up-my-nose

Browse Source 
Adds the Elusive Black crayon
This commit is contained in:
Fox McCloud
2021-05-15 10:31:22 -04:00
committed by GitHub
parent 83e4554c1a b97fedf863
commit f76efc8f73
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/crayons.dm
+5
View File
@@ -174,6 +174,11 @@
colourName = "purple"
..()
/obj/item/toy/crayon/black
icon_state = "crayonblack"
colour = "#000000"
colourName = "black"
/obj/item/toy/crayon/white
icon_state = "crayonwhite"
colour = "#FFFFFF"
code/game/objects/items/weapons/storage/fancy.dm
+3 -1
View File
@@ -121,19 +121,21 @@
icon = 'icons/obj/crayons.dmi'
icon_state = "crayonbox"
w_class = WEIGHT_CLASS_SMALL
storage_slots = 6
storage_slots = 8
icon_type = "crayon"
can_hold = list(
/obj/item/toy/crayon
)
/obj/item/storage/fancy/crayons/populate_contents()
new /obj/item/toy/crayon/white(src)
new /obj/item/toy/crayon/red(src)
new /obj/item/toy/crayon/orange(src)
new /obj/item/toy/crayon/yellow(src)
new /obj/item/toy/crayon/green(src)
new /obj/item/toy/crayon/blue(src)
new /obj/item/toy/crayon/purple(src)
new /obj/item/toy/crayon/black(src)
update_icon()
/obj/item/storage/fancy/crayons/update_icon()