diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index e32a76e1e0a..29e1d86ebb9 100644 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -15,6 +15,72 @@ containername = "Special Ops crate" hidden = 1 +/datum/supply_packs/boxes + name = "Empty Box supplies" + contains = list("/obj/item/weapon/storage/box", + "/obj/item/weapon/storage/box", + "/obj/item/weapon/storage/box", + "/obj/item/weapon/storage/box", + "/obj/item/weapon/storage/box", + "/obj/item/weapon/storage/box", + "/obj/item/weapon/storage/box", + "/obj/item/weapon/storage/box", + "/obj/item/weapon/storage/box", + "/obj/item/weapon/storage/box",) + cost = 5 + containertype = "/obj/structure/closet/crate" + containername = "Empty Box crate" + +/datum/supply_packs/stationary + name = "Stationary supplies" + contains = list("/obj/item/device/taperecorder", + "/obj/item/weapon/packageWrap", + "/obj/item/weapon/clipboard", + "/obj/item/weapon/clipboard", + "/obj/item/weapon/hand_labeler", + "/obj/item/weapon/paper_bin", + "/obj/item/weapon/pen", + "/obj/item/weapon/pen", + "/obj/item/weapon/pen", + "/obj/item/weapon/stamp", + "/obj/item/weapon/stamp/denied", + "/obj/item/weapon/stamperaser", + "/obj/item/weapon/storage/diskbox", + "/obj/item/weapon/storage/recordsbox", + ) + cost = 5 + containertype = "/obj/structure/closet/crate" + containername = "Stationary crate" + +/datum/supply_packs/artscrafts + name = "Arts and Crafts supplies" + contains = list("/obj/item/toy/crayonbox", + "/obj/item/weapon/c_tube", + "/obj/item/weapon/camera_test", + "/obj/item/weapon/storage/photo_album", + "/obj/item/weapon/packageWrap", + "/obj/item/weapon/paint/red", + "/obj/item/weapon/paint/green", + "/obj/item/weapon/paint/blue", + "/obj/item/weapon/paint/yellow", + "/obj/item/weapon/paint/violet", + "/obj/item/weapon/paint/black", + "/obj/item/weapon/paint/white", + "/obj/item/weapon/paint/paint_remover", + "/obj/item/weapon/wrapping_paper", + "/obj/item/weapon/wrapping_paper", + "/obj/item/weapon/wrapping_paper") + cost = 5 + containertype = "/obj/structure/closet/crate" + containername = "Arts and Crafts crate" + +/datum/supply_packs/empty + name = "Empty crate" + contains = list() + cost = 5 + containertype = "/obj/structure/closet/crate" + containername = "crate" + /datum/supply_packs/charge cost = 10 containertype = "/obj/structure/closet/crate" diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index 91b3d639f3e..774a3ac3972 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -29,10 +29,10 @@ var/global/list/cached_icons = list() color = "FFFF00" icon_state = "paint_yellow" -/obj/item/weapon/paint/violet //no icon +/obj/item/weapon/paint/violet name = "Violet paint" color = "FF00FF" - icon_state = "paint_neutral" + icon_state = "paint_violet" /obj/item/weapon/paint/black name = "Black paint" @@ -44,7 +44,6 @@ var/global/list/cached_icons = list() color = "FFFFFF" icon_state = "paint_white" - /obj/item/weapon/paint/anycolor name = "Any color" icon_state = "paint_neutral" diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 3ef97652238..1b039da7326 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ