diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index 1dc066d1a42..d5398de3498 100755 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -74,7 +74,7 @@ /datum/supply_packs/artscrafts name = "Arts and Crafts supplies" - contains = list("/obj/item/toy/crayonbox", + contains = list("/obj/item/weapon/storage/crayonbox", "/obj/item/weapon/camera_test", "/obj/item/weapon/storage/photo_album", "/obj/item/weapon/packageWrap", @@ -804,7 +804,7 @@ contraband = 1 group = "NanoTrasen Contraband Storage" -/datum/supply_packs/poster/New() +/datum/supply_packs/contraband/New() var/list/tempContains = list() for(var/i = 0,i<5,i++) tempContains += pick(contains) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index ac97147c4c9..c97a75d977d 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -185,7 +185,7 @@ H.equip_if_possible(new /obj/item/weapon/bikehorn(H), H.slot_in_backpack) H.equip_if_possible(new /obj/item/weapon/stamp/clown(H), H.slot_in_backpack) H.equip_if_possible(new /obj/item/toy/crayon/rainbow(H), H.slot_in_backpack) - H.equip_if_possible(new /obj/item/toy/crayonbox(H), H.slot_in_backpack) + H.equip_if_possible(new /obj/item/weapon/storage/crayonbox(H), H.slot_in_backpack) H.mutations |= CLOWN return 1 diff --git a/code/game/objects/storage/crates.dm b/code/game/objects/storage/crates.dm index d4dd6126628..6b0400f4924 100644 --- a/code/game/objects/storage/crates.dm +++ b/code/game/objects/storage/crates.dm @@ -38,6 +38,15 @@ icon_opened = "crateopen" icon_closed = "crate" +/obj/structure/closet/crate/contraband + name = "Contraband crate" + desc = "A random assortment of items manufactured by providers NOT listed under Nanotrasen's whitelist." + icon = 'storage.dmi' + icon_state = "crate" + density = 1 + icon_opened = "crateopen" + icon_closed = "crate" + /obj/structure/closet/crate/poster name = "Poster crate" desc = "A random assortment of posters manufactured by providers NOT listed under Nanotrasen's whitelist."