diff --git a/code/game/objects/effects/posters/contraband.dm b/code/game/objects/effects/posters/contraband.dm index 69f7ebc41ee..556d1ed2772 100644 --- a/code/game/objects/effects/posters/contraband.dm +++ b/code/game/objects/effects/posters/contraband.dm @@ -672,3 +672,158 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/singletank_bom MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/fake_bombable, 32) + +/obj/structure/sign/poster/contraband/dream + name = "Dream" + desc = "You feel inspired to follow your dreams." + icon_state = "dream" + +/obj/item/poster/contraband/dream // Rolled poster + name = "Dream" + poster_type = /obj/structure/sign/poster/contraband/dream + icon_state = "rolled_poster" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/dream, 32) + +/obj/structure/sign/poster/contraband/beekind + name = "Bee Kind" + desc = "Always bee kind to others!" + icon_state = "beekind" + +/obj/item/poster/contraband/beekind + name = "Bee Kind" + poster_type = /obj/structure/sign/poster/contraband/beekind + icon_state = "rolled_poster" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/beekind, 32) + +/obj/structure/sign/poster/contraband/heart + name = "Heart" + desc = "What a heartwarming poster." + icon_state = "heart" + +/obj/item/poster/contraband/heart + name = "Heart" + poster_type = /obj/structure/sign/poster/contraband/heart + icon_state = "rolled_poster" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/heart, 32) + +/obj/structure/sign/poster/contraband/dolphin + name = "Dolphin" + desc = "A poster of a beautiful dolphin." + icon_state = "dolphin" + +/obj/item/poster/contraband/dolphin + name = "Dolphin" + poster_type = /obj/structure/sign/poster/contraband/dolphin + icon_state = "rolled_poster" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/dolphin, 32) + +/obj/structure/sign/poster/contraband/principles + name = "Our Principles" + desc = "The makers of this poster purport to live by four principles. Someone has scrawled a fifth one at the bottom." + icon_state = "principles" + +/obj/item/poster/contraband/principles + name = "Our Principles" + poster_type = /obj/structure/sign/poster/contraband/principles + icon_state = "rolled_poster" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/principles, 32) + +/obj/structure/sign/poster/contraband/trigger + name = "Trigger" + desc = "Happy trails to you, until we meet again! 1/8." + icon_state = "trigger" + +/obj/item/poster/contraband/trigger + name = "Trigger" + poster_type = /obj/structure/sign/poster/contraband/trigger + icon_state = "rolled_poster" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/trigger, 32) + +/obj/structure/sign/poster/contraband/barbaro + name = "Barbaro" + desc = "A majestic horse with the heart of a winner. 2/8." + icon_state = "barbaro" + +/obj/item/poster/contraband/barbaro + name = "Barbaro" + poster_type = /obj/structure/sign/poster/contraband/barbaro + icon_state = "rolled_poster" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/barbaro, 32) + +/obj/structure/sign/poster/contraband/seabiscuit + name = "Seabiscuit" + desc = "The little horse that could. 3/8." + icon_state = "seabiscuit" + +/obj/item/poster/contraband/seabiscuit + name = "Seabiscuit" + poster_type = /obj/structure/sign/poster/contraband/seabiscuit + icon_state = "rolled_poster" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/seabiscuit, 32) + +/obj/structure/sign/poster/contraband/pharlap + name = "Phar Lap" + desc = "A wonder from down under. 4/8." + icon_state = "pharlap" + +/obj/item/poster/contraband/pharlap + name = "Phar Lap" + poster_type = /obj/structure/sign/poster/contraband/pharlap + icon_state = "rolled_poster" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/pharlap, 32) + +/obj/structure/sign/poster/contraband/waradmiral + name = "War Admiral" + desc = "Some say he was second best, but he still comes first in your heart. 5/8." + icon_state = "waradmiral" + +/obj/item/poster/contraband/waradmiral + name = "War Admiral" + poster_type = /obj/structure/sign/poster/contraband/waradmiral + icon_state = "rolled_poster" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/waradmiral, 32) + +/obj/structure/sign/poster/contraband/silver + name = "Silver" + desc = "If he wants to go, he should be free. 6/8." + icon_state = "silver" + +/obj/item/poster/contraband/silver + name = "Silver" + poster_type = /obj/structure/sign/poster/contraband/silver + icon_state = "rolled_poster" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/silver, 32) + +/obj/structure/sign/poster/contraband/jovial + name = "Jovial" + desc = "All hail the orange horse! 7/8." + icon_state = "jovial" + +/obj/item/poster/contraband/jovial + name = "Jovial" + poster_type = /obj/structure/sign/poster/contraband/jovial + icon_state = "rolled_poster" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/jovial, 32) + +/obj/structure/sign/poster/contraband/bojack + name = "Bojack" + desc = "It doesn't matter. Nothing matters. 8/8." + icon_state = "bojack" + +/obj/item/poster/contraband/bojack + poster_type = /obj/structure/sign/poster/contraband/bojack + icon_state = "rolled_poster" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/bojack, 32) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 57575e5e412..cb17660382f 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -475,3 +475,15 @@ /obj/structure/closet/crate/add_to_roundstart_list() return + +/obj/structure/closet/crate/pink + name = "pink crate" + desc = "A glittery pink crate." + icon_state = "pink" + base_icon_state = "pink" + +/obj/structure/closet/crate/lavender + name = "lavender crate" + desc = "A glittery purple... no, lavender crate." + icon_state = "lavender" + base_icon_state = "lavender" diff --git a/code/modules/cargo/markets/market_items/misc.dm b/code/modules/cargo/markets/market_items/misc.dm index 2bbbe3f3a3a..509f499b3c2 100644 --- a/code/modules/cargo/markets/market_items/misc.dm +++ b/code/modules/cargo/markets/market_items/misc.dm @@ -172,3 +172,34 @@ stock_min = 3 stock_max = 8 availability_prob = 90 + +/datum/market_item/misc/girlypop + name = "Girlypop Posters" + desc = "A collection of cute and adorable posters. Girl power!" + price_min = PAYCHECK_CREW * 2 + price_max = PAYCHECK_CREW * 5 + item = /obj/item/poster/contraband/heart // gives it the rolled poster icon in the menu + stock_min = 1 + stock_max = 3 + availability_prob = 90 + +/datum/market_item/misc/girlypop/spawn_item(loc, datum/market_purchase/purchase) + . = ..() + var/obj/structure/closet/crate/pink/C = new(loc) + for (var/type in list( + /obj/item/poster/contraband/dream, + /obj/item/poster/contraband/beekind, + /obj/item/poster/contraband/heart, + /obj/item/poster/contraband/dolphin, + /obj/item/poster/contraband/principles, + /obj/item/poster/contraband/trigger, + /obj/item/poster/contraband/barbaro, + /obj/item/poster/contraband/seabiscuit, + /obj/item/poster/contraband/pharlap, + /obj/item/poster/contraband/waradmiral, + /obj/item/poster/contraband/silver, + /obj/item/poster/contraband/jovial, + /obj/item/poster/contraband/bojack, + )) + new type(C) + return C diff --git a/icons/obj/poster.dmi b/icons/obj/poster.dmi index 2644b1dba58..564c1e95cc4 100644 Binary files a/icons/obj/poster.dmi and b/icons/obj/poster.dmi differ diff --git a/icons/obj/storage/crates.dmi b/icons/obj/storage/crates.dmi index 2cb8f51fcf6..31d56997605 100644 Binary files a/icons/obj/storage/crates.dmi and b/icons/obj/storage/crates.dmi differ