From e5c22d527e9791703dc5991a9fa46b2e324c4e9b Mon Sep 17 00:00:00 2001 From: Expletive Date: Fri, 16 Jun 2017 21:26:04 -0700 Subject: [PATCH] Move unique crayons --- code/game/objects/items/devices/PDA/PDA_types.dm | 2 ++ code/modules/jobs/job_types/civilian.dm | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm index aece468dd6c..01c3a38fdc0 100644 --- a/code/game/objects/items/devices/PDA/PDA_types.dm +++ b/code/game/objects/items/devices/PDA/PDA_types.dm @@ -2,6 +2,7 @@ /obj/item/device/pda/clown name = "clown PDA" default_cartridge = /obj/item/weapon/cartridge/virus/clown + inserted_item = /obj/item/toy/crayon/rainbow icon_state = "pda-clown" desc = "A portable microcomputer by Thinktronic Systems, LTD. The surface is coated with polytetrafluoroethylene and banana drippings." ttone = "honk" @@ -80,6 +81,7 @@ /obj/item/device/pda/mime name = "mime PDA" default_cartridge = /obj/item/weapon/cartridge/virus/mime + inserted_item = /obj/item/toy/crayon/mime icon_state = "pda-mime" silent = 1 ttone = "silence" diff --git a/code/modules/jobs/job_types/civilian.dm b/code/modules/jobs/job_types/civilian.dm index a770711e6be..f52d8aca178 100644 --- a/code/modules/jobs/job_types/civilian.dm +++ b/code/modules/jobs/job_types/civilian.dm @@ -29,7 +29,6 @@ Clown shoes = /obj/item/clothing/shoes/clown_shoes mask = /obj/item/clothing/mask/gas/clown_hat l_pocket = /obj/item/weapon/bikehorn - r_pocket = /obj/item/toy/crayon/rainbow backpack_contents = list( /obj/item/weapon/stamp/clown = 1, /obj/item/weapon/reagent_containers/spray/waterflower = 1, @@ -91,8 +90,7 @@ Mime gloves = /obj/item/clothing/gloves/color/white head = /obj/item/clothing/head/beret suit = /obj/item/clothing/suit/suspenders - backpack_contents = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing=1,\ - /obj/item/toy/crayon/mime=1) + backpack_contents = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing=1) backpack = /obj/item/weapon/storage/backpack/mime satchel = /obj/item/weapon/storage/backpack/mime