diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 361d0bbed9b..86dedcc03d2 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -130,7 +130,8 @@ Detective H.equip_to_slot_or_del(new /obj/item/clothing/head/det_hat(H), slot_head) H.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(H), slot_gloves) H.equip_to_slot_or_del(new /obj/item/clothing/suit/det_suit(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/weapon/lighter/zippo(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/toy/crayon/white(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/weapon/lighter/zippo(H), slot_r_store) var/obj/item/clothing/mask/cigarette/cig = new /obj/item/clothing/mask/cigarette(H) cig.light("") diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index bd6cd8afb25..fe8fe4138bd 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -28,6 +28,11 @@ colour = "#DA00FF" colourName = "purple" +/obj/item/toy/crayon/white + icon_state = "crayonwhite" + colour = "#FFFFFF" + colourName = "white" + /obj/item/toy/crayon/mime icon_state = "crayonmime" desc = "A very sad-looking crayon." diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 7fd57e7f9cb..6e128060017 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -415,7 +415,7 @@ attack_verb = list("attacked", "coloured") var/colour = "#FF0000" //RGB var/drawtype = "rune" - var/list/graffiti = list("amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa") + var/list/graffiti = list("amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa","body") var/list/letters = 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") var/uses = 30 //0 for unlimited uses var/instant = 0 diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index f45405202f9..3c347b9dae7 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -200,6 +200,7 @@ new /obj/item/clothing/head/det_hat(src) new /obj/item/clothing/gloves/color/black(src) new /obj/item/clothing/under/rank/det/grey(src) + new /obj/item/clothing/tie/waistcoat(src) new /obj/item/clothing/suit/det_suit/grey(src) new /obj/item/clothing/head/fedora(src) new /obj/item/clothing/shoes/laceup(src) diff --git a/icons/effects/crayondecal.dmi b/icons/effects/crayondecal.dmi index 6cede450e75..dc3f8f82996 100644 Binary files a/icons/effects/crayondecal.dmi and b/icons/effects/crayondecal.dmi differ diff --git a/icons/obj/crayons.dmi b/icons/obj/crayons.dmi index 7ebabd5a81e..cb4df277f6e 100644 Binary files a/icons/obj/crayons.dmi and b/icons/obj/crayons.dmi differ