diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index 2f86a2306f0..fe4b7cf7983 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -510,6 +510,126 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/random, 32) desc = "Andromeda Bitters: good for the body, good for the soul. Made in New Trinidad, now and forever." icon_state = "andromeda_bitters" +/obj/structure/sign/poster/contraband/blasto_detergent + name = "Blasto Brand Laundry Detergent" + desc = "Sheriff Blasto's here to take back Laundry County from the evil Johnny Dirt and the Clothstain Crew, and he's brought a posse. It's High Noon for Tough Stains: Blasto brand detergent, available at all good stores." + icon_state = "blasto_detergent" + +/obj/structure/sign/poster/contraband/eistee + name = "EisT: The New Revolution in Energy" + desc = "New from EisT, try EisT Energy, available in a kaleidoscope range of flavors. EisT: Precision German Engineering for your Thirst." + icon_state = "eistee" + +/obj/structure/sign/poster/contraband/eistee/examine_more(mob/user) + . = ..() + . += span_notice("You browse some of the poster's information...") + . += "\t[span_info("Get a taste of the tropics with Amethyst Sunrise, one of the many new flavours of EisT Energy now available from EisT.")]" + . += "\t[span_info("With pink grapefruit, yuzu, and yerba mate, Amethyst Sunrise gives you a great start in the morning, or a welcome boost throughout the day.")]" + . += "\t[span_info("Get EisT Energy today at your nearest retailer, or online at eist.de.tg/store/.")]" + return . + +/obj/structure/sign/poster/contraband/little_fruits + name = "Little Fruits: Honey, I Shrunk the Fruitbowl" + desc = "Little Fruits are the galaxy's leading vitamin-enriched gummy candy product, packed with everything you need to stay healthy in one great tasting package. Get yourself a bag today!" + icon_state = "little_fruits" + +/obj/structure/sign/poster/contraband/little_fruits/examine_more(mob/user) + . = ..() + . += span_notice("You browse some of the poster's information...") + . += "\t[span_info("Oh no, there's been a terrible accident at the Little Fruits factory! We shrunk the fruits!")]" + . += "\t[span_info("Wait, hang on, that's what we've always done! That's right, at Little Fruits our gummy candies are made to be as healthy as the real deal, but smaller and sweeter, too!")]" + . += "\t[span_info("Get yourself a bag of our Classic Mix today, or perhaps you're interested in our other options? See our full range today on the extranet at little_fruits.kr.tg.")]" + . += "\t[span_info("Little Fruits: Size Matters.")]" + return . + +/obj/structure/sign/poster/contraband/jumbo_bar + name = "Jumbo Ice Cream Bars" + desc = "Get a taste of the Big Life with Jumbo Ice Cream Bars, from Happy Heart." + icon_state = "jumbo_bar" + +/obj/structure/sign/poster/contraband/calada_jelly + name = "Calada Anobar Jelly" + desc = "A treat from Tizira to satisfy all tastes, made from the finest anobar wood and luxurious Taraviero honey. Calada: a full tree in every jar." + icon_state = "calada_jelly" + +/obj/structure/sign/poster/contraband/triumphal_arch + name = "Zagoskeld Art Print #1: The Arch on the March" + desc = "One of the Zagoskeld Art Print series. It depicts the Arch of Unity (also know as the Triumphal Arch) at the Plaza of Triumph, with the Avenue of the Victorious March in the background." + icon_state = "triumphal_arch" + +/obj/structure/sign/poster/contraband/mothic_rations + name = "Mothic Ration Chart" + desc = "A poster showing a commissary menu from the Mothic fleet flagship, the Va Lümla. It lists various consumable items alongside prices in ration tickets." + icon_state = "mothic_rations" + +/obj/structure/sign/poster/contraband/mothic_rations/examine_more(mob/user) + . = ..() + . += span_notice("You browse some of the poster's information...") + . += "\t[span_info("Va Lümla Commissary Menu (Spring 335)")]" + . += "\t[span_info("Windgrass Cigarettes, Half-Pack (6): 1 Ticket")]" + . += "\t[span_info("Töchtaüse Schnapps, Bottle (4 Measures): 2 Tickets")]" + . += "\t[span_info("Activin Gum, Pack (4): 1 Ticket")]" + . += "\t[span_info("A18 Sustenance Bar, Breakfast, Bar (4): 1 Ticket")]" + . += "\t[span_info("Pizza, Margherita, Standard Slice: 1 Ticket")]" + . += "\t[span_info("Keratin Wax, Medicated, Tin (20 Measures): 2 Tickets")]" + . += "\t[span_info("Setae Soap, Herb Scent, Bottle (20 Measures): 2 Tickets")]" + . += "\t[span_info("Additional Bedding, Floral Print, Sheet: 5 Tickets")]" + return . + +/obj/structure/sign/poster/contraband/wildcat + name = "Wildcat Customs Screambike" + desc = "A pinup poster showing a Wildcat Customs Dante Screambike- the fastest production sublight open-frame vessel in the galaxy." + icon_state = "wildcat" + +/obj/structure/sign/poster/contraband/babel_device + name = "Linguafacile Babel Device" + desc = "A poster advertising Linguafacile's new Babel Device model. 'Calibrated for excellent performance on all Human languages, as well as most common variants of Draconic and Mothic!'" + icon_state = "babel_device" + +/obj/structure/sign/poster/contraband/pizza_imperator + name = "Pizza Imperator" + desc = "An advertisement for Pizza Imperator. Their crusts may be tough and their sauce may be thin, but they're everywhere, so you've gotta give in." + icon_state = "pizza_imperator" + +/obj/structure/sign/poster/contraband/thunderdrome + name = "Thunderdrome Concert Advertisement" + desc = "An advertisement for a concert at the Adasta City Thunderdrome, the largest nightclub in human space." + icon_state = "thunderdrome" + +/obj/structure/sign/poster/contraband/rush_propaganda + name = "A New Life" + desc = "An old poster from around the time of the First Spinward Rush. It depicts a view of wide, unspoiled lands, ready for Humanity's Manifest Destiny." + icon_state = "rush_propaganda" + +/obj/structure/sign/poster/contraband/rush_propaganda/examine_more(mob/user) + . = ..() + . += span_notice("You browse some of the poster's information...") + . += "\t[span_info("TerraGov needs you!")]" + . += "\t[span_info("A new life in the colonies awaits intrepid adventurers! All registered colonists are guaranteed transport, land and subsidies!")]" + . += "\t[span_info("You could join the legacy of hardworking humans who settled such new frontiers as Mars, Adasta or Saint Mungo!")]" + . += "\t[span_info("To apply, inquire at your nearest Colonial Affairs office for evaluation. Our locations can be found at www.terra.gov/colonial_affairs.")]" + return . + +/obj/structure/sign/poster/contraband/tipper_cream_soda + name = "Tipper's Cream Soda" + desc = "An old advertisement for an obscure cream soda brand, now bankrupt due to legal problems." + icon_state = "tipper_cream_soda" + +/obj/structure/sign/poster/contraband/tea_over_tizira + name = "Movie Poster: Tea Over Tizira" + desc = "A poster for a thought-provoking arthouse movie about the Human-Lizard war, criticised by human supremacist groups for its morally-grey portrayal of the war." + icon_state = "tea_over_tizira" + +/obj/structure/sign/poster/contraband/tea_over_tizira/examine_more(mob/user) + . = ..() + . += span_notice("You browse some of the poster's information...") + . += "\t[span_info("At the climax of the Human-Lizard war, the human crew of a bomber rescue two enemy soldiers from the vacuum of space. Seeing the souls behind the propaganda, they begin to question their orders, and imprisonment turns to hospitality.")]" + . += "\t[span_info("Is victory worth losing our humanity?")]" + . += "\t[span_info("Starring Dara Reilly, Anton DuBois, Jennifer Clarke, Raz-Parla and Seri-Lewa. An Adriaan van Jenever production. A Carlos de Vivar film. Screenplay by Robert Dane. Music by Joel Karlsbad. Produced by Adriaan van Jenever. Directed by Carlos de Vivar.")]" + . += "\t[span_info("Heartbreaking and thought-provoking- Tea Over Tizira asks questions that few have had the boldness to ask before: The London New Inquirer")]" + . += "\t[span_info("Rated PG13. A Pangalactic Studios Picture.")]" + return . + /obj/structure/sign/poster/contraband/syndiemoth //Original PR at https://github.com/BeeStation/BeeStation-Hornet/pull/1747 (Also pull/1982); original art credit to AspEv name = "Syndie Moth - Nuclear Operation" desc = "A Syndicate-commissioned poster that uses Syndie Moth™ to tell the viewer to keep the nuclear authentication disk unsecured. \"Peace was never an option!\" No good employee would listen to this nonsense." @@ -751,6 +871,34 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/random, 32) desc = "This informational poster provides information on some of the prizes available via the NT Corporate Perks program, including a two-week vacation for two on the resort world Idyllus." icon_state = "corporate_perks_vacation" +/obj/structure/sign/poster/official/jim_nortons + name = "Jim Norton's Québécois Coffee" + desc = "An advertisement for Jim Norton's, the Québécois coffee joint that's taken the galaxy by storm." + icon_state = "jim_nortons" + +/obj/structure/sign/poster/official/jim_nortons/examine_more(mob/user) + . = ..() + . += span_notice("You browse some of the poster's information...") + . += "\t[span_info("From our roots in Trois-Rivières, we've worked to bring you the best coffee money can buy since 1965.")]" + . += "\t[span_info("So stop by Jim's today- have a hot cup of coffee and a donut, and live like the Québécois do.")]" + . += "\t[span_info("Jim Norton's Québécois Coffee: Toujours Le Bienvenu.")]" + return . + +/obj/structure/sign/poster/official/twenty_four_seven + name = "24-Seven Supermarkets" + desc = "An advertisement for 24-Seven supermarkets, advertising their new 24-Stops as part of their partnership with Nanotrasen." + icon_state = "twenty_four_seven" + +/obj/structure/sign/poster/official/tactical_game_cards + name = "Nanotrasen Tactical Game Cards" + desc = "An advertisement for Nanotrasen's TCG cards: BUY MORE CARDS." + icon_state = "tactical_game_cards" + +/obj/structure/sign/poster/official/midtown_slice + name = "Midtown Slice Pizza" + desc = "An advertisement for Midtown Slice Pizza, the official pizzeria partner of Nanotrasen. Midtown Slice: like a slice of home, no matter where you are." + icon_state = "midtown_slice" + //SafetyMoth Original PR at https://github.com/BeeStation/BeeStation-Hornet/pull/1747 (Also pull/1982) //SafetyMoth art credit goes to AspEv /obj/structure/sign/poster/official/moth_hardhat diff --git a/code/game/objects/structures/billboard.dm b/code/game/objects/structures/billboard.dm index f977341adf1..58462527063 100644 --- a/code/game/objects/structures/billboard.dm +++ b/code/game/objects/structures/billboard.dm @@ -34,6 +34,21 @@ desc = "A billboard advertising Azik Interstellar and their newest model: the Autocrat Solar Sailer. Azik Interstellar: Tiziran Refinement for Galactic Necessities." icon_state = "billboard_azik" +/obj/structure/billboard/cvr + name = "\improper Charlemagne von Rheinland billboard" + desc = "A billboard advertising Charlemagne von Rheinland's Germania-class superyacht. Charlemagne von Rheinland: Die Werft der Könige." + icon_state = "billboard_cvr" + +/obj/structure/billboard/twenty_four_seven + name = "\improper 24-Seven billboard" + desc = "A billboard advertising 24-Seven's new range of limited-edition Slushee flavours. 24-Seven: All Day, Everyday." + icon_state = "billboard_twenty_four_seven" + +/obj/structure/billboard/starway + name = "\improper Starway Transit billboard" + desc = "A billboard advertising Starway Transit's direct flight from New Moscow to New York: only 2000 credits for an economy class berth. Starway: Your Ticket to the Stars." + icon_state = "billboard_starway" + /obj/structure/billboard/lizards_gas name = "\improper The Lizard's Gas billboard" desc = "A billboard labelling the gas station known as 'The Lizard's Gas'. It's been lost to time, and this is the only known gas station of its type. It's hard to see why it flopped based on the quality of the billboard." diff --git a/code/game/objects/structures/containers.dm b/code/game/objects/structures/containers.dm new file mode 100644 index 00000000000..b2f21b63261 --- /dev/null +++ b/code/game/objects/structures/containers.dm @@ -0,0 +1,72 @@ +/obj/structure/shipping_container + name = "shipping container" + desc = "A standard-measure shipping container for bulk transport of goods. This one is blank, offering no clue as to its contents." + icon = 'icons/obj/containers.dmi' + icon_state = "container_blank" + max_integrity = 1000 + bound_width = 96 + bound_height = 64 + density = TRUE + anchored = TRUE + +/obj/structure/shipping_container/nanotrasen + name = "\improper Nanotrasen shipping container" + desc = "A standard-measure shipping container for bulk transport of goods. This one prominently features Nanotrasen's logo, and so presumably could be carrying anything." + icon_state = "nanotrasen" + +/obj/structure/shipping_container/deforest + name = "\improper DeForest Medical Corp. shipping container" + desc = "A standard-measure shipping container for bulk transport of goods. This one is from DeForest, and so is probably carrying medical supplies." + icon_state = "deforest" + +/obj/structure/shipping_container/kosmologistika + name = "\improper Kosmologistika shipping container" + desc = "A standard-measure shipping container for bulk transport of goods. This one is from Kosmologistika, the logistics company owned and operated by the SSC." + icon_state = "kosmologistika" + +/obj/structure/shipping_container/nakamura + name = "\improper Nakamura Engineering shipping container" + desc = "A standard-measure shipping container for bulk transport of goods. This one is from Nakamura, presumably for transporting tools or heavy industrial equipment." + icon_state = "nakamura" + +/obj/structure/shipping_container/kahraman + name = "\improper Kahraman Heavy Industry shipping container" + desc = "A standard-measure shipping container for bulk transport of goods. This one is from Kahraman, and is reinforced for carrying ore." + icon_state = "kahraman" + +/obj/structure/shipping_container/kahraman/alt + icon_state = "kahraman_alt" + +/obj/structure/shipping_container/nthi + name = "\improper Nanotrasen Heavy Industries shipping container" + desc = "A standard-measure shipping container for bulk transport of goods. This one is from NTHI: Nanotrasen's mining and refining subdivision." + icon_state = "nthi" + +/obj/structure/shipping_container/conarex + name = "\improper Conarex Aeronautics shipping container" + desc = "A standard-measure shipping container for bulk transport of goods. This one is from Conarex Aeronautics, and is probably carrying spacecraft parts (or a bribery scandal) as a result." + icon_state = "conarex" + +/obj/structure/shipping_container/vitezstvi + name = "\improper Vítězství Arms shipping container" + desc = "A standard-measure shipping container for bulk transport of goods. This one is from Vítězství Arms, proudly proclaiming that Vítězství weapons mean victory." + icon_state = "vitezstvi" + +//Syndies +/obj/structure/shipping_container/cybersun + name = "\improper Cybersun Industries shipping container" + desc = "A standard-measure shipping container for bulk transport of goods. This one prominently features Cybersun's logo, and so presumably could be carrying almost anything." + icon_state = "cybersun" + +/obj/structure/shipping_container/gorlex + name = "\improper Gorlex Securities shipping container" + desc = "A standard-measure shipping container for bulk transport of goods. This one is from Gorlex Securities, and is probably carrying their primary export: war crimes." + icon_state = "gorlex" + +/obj/structure/shipping_container/gorlex/red + icon_state = "gorlex_red" + +/obj/structure/shipping_container/donk_co + name = "\improper Donk Co. shipping container" + desc = "A standard-measure shipping container for bulk transport of goods. This one is from Donk Co. and so could be carrying just about anything- although it's probably Donk Pockets." + icon_state = "donk_co" diff --git a/code/game/objects/structures/signs/signs_flags.dm b/code/game/objects/structures/signs/signs_flags.dm new file mode 100644 index 00000000000..1d17765201e --- /dev/null +++ b/code/game/objects/structures/signs/signs_flags.dm @@ -0,0 +1,47 @@ +/obj/structure/sign/flag + name = "flag of the IT Division" + desc = "The flag of the Nanotrasen IT Division. Bears a symbol that only makes sense to those that understand." + icon = 'icons/obj/flags.dmi' + icon_state = "flag_coder" + +/obj/structure/sign/flag/nanotrasen + name = "flag of Nanotrasen" + desc = "The official corporate flag of Nanotrasen. Mostly flown as a ceremonial piece, or to mark land on a new frontier." + icon_state = "flag_nt" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/nanotrasen, 32) + +/obj/structure/sign/flag/ssc + name = "flag of the Spinward Stellar Coalition" + desc = "The flag of the Independent Coalition of the Spinward Sector. The colours represent panslavism, and the three stars represent the three central systems of the SSC." + icon_state = "flag_ssc" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/ssc, 32) + +/obj/structure/sign/flag/terragov + name = "flag of TerraGov" + desc = "The flag of TerraGov. It's a symbol of humanity no matter where they go, or how much they wish it wasn't." + icon_state = "flag_terragov" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/terragov, 32) + +/obj/structure/sign/flag/tizira + name = "flag of the Tiziran Empire" + desc = "The flag of the Great Empire of Tizira. Depending on who you ask, it represents strength or being stuck in the past." + icon_state = "flag_tizira" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/tizira, 32) + +/obj/structure/sign/flag/mothic + name = "flag of the Grand Nomad Fleet" + desc = "The flag of the Mothic Grand Nomad Fleet. A classic naval ensign, its use has superceded the old national flag which can be seen in its canton." + icon_state = "flag_mothic" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/mothic, 32) + +/obj/structure/sign/flag/mars + name = "flag of the Martian Republic" + desc = "The flag of Mars. Originally a revolutionary flag during the Martian Rebellions, it has since been adopted as the official flag of the planet, as a reminder of how Mars fought for representation and democracy." + icon_state = "flag_mars" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/mars, 32) diff --git a/code/game/objects/structures/signs/signs_interactive.dm b/code/game/objects/structures/signs/signs_interactive.dm new file mode 100644 index 00000000000..6e299bda1b9 --- /dev/null +++ b/code/game/objects/structures/signs/signs_interactive.dm @@ -0,0 +1,26 @@ +/obj/structure/sign/clock + name = "wall clock" + desc = "It's a bluespace-controlled wall clock showing both the local Coalition Standard Time and the galactic Treaty Coordinated Time. Perfect for staring at instead of working." + icon_state = "clock" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/clock, 32) + +/obj/structure/sign/clock/examine(mob/user) + . = ..() + . += span_info("The current CST (local) time is: [station_time_timestamp()].") + . += span_info("The current TCT (galactic) time is: [time2text(world.realtime, "hh:mm:ss")].") + +/obj/structure/sign/calendar + name = "wall calendar" + desc = "It's an old-school wall calendar. Sure, it might be obsolete with modern technology, but it's still hard to imagine an office without one." + icon_state = "calendar" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/calendar, 32) + +/obj/structure/sign/calendar/examine(mob/user) + . = ..() + . += span_info("The current date is: [time2text(world.realtime, "DDD, MMM DD")], [GLOB.year_integer+540].") + if(SSevents.holidays) + . += span_info("Events:") + for(var/holidayname in SSevents.holidays) + . += span_info("[holidayname]") diff --git a/icons/obj/billboard.dmi b/icons/obj/billboard.dmi index bd09c7818dd..3065c7068f6 100644 Binary files a/icons/obj/billboard.dmi and b/icons/obj/billboard.dmi differ diff --git a/icons/obj/containers.dmi b/icons/obj/containers.dmi new file mode 100644 index 00000000000..4ea0af19cb6 Binary files /dev/null and b/icons/obj/containers.dmi differ diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi index f5ce5e092c8..6e9cc53fe25 100644 Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index ec62081ec80..d08289a47e4 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ diff --git a/icons/obj/flags.dmi b/icons/obj/flags.dmi new file mode 100644 index 00000000000..9ab6d18a3c0 Binary files /dev/null and b/icons/obj/flags.dmi differ diff --git a/modular_skyrat/modules/aesthetics/posters/contraband.dmi b/modular_skyrat/modules/aesthetics/posters/contraband.dmi index 44847464661..230b5637ec3 100644 Binary files a/modular_skyrat/modules/aesthetics/posters/contraband.dmi and b/modular_skyrat/modules/aesthetics/posters/contraband.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 39f89ec49a1..1100676952d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1859,6 +1859,7 @@ #include "code\game\objects\structures\billboard.dm" #include "code\game\objects\structures\bonfire.dm" #include "code\game\objects\structures\chess.dm" +#include "code\game\objects\structures\containers.dm" #include "code\game\objects\structures\deployable_turret.dm" #include "code\game\objects\structures\destructible_structures.dm" #include "code\game\objects\structures\displaycase.dm" @@ -1965,6 +1966,8 @@ #include "code\game\objects\structures\plaques\static_plaques.dm" #include "code\game\objects\structures\signs\_signs.dm" #include "code\game\objects\structures\signs\signs_departments.dm" +#include "code\game\objects\structures\signs\signs_flags.dm" +#include "code\game\objects\structures\signs\signs_interactive.dm" #include "code\game\objects\structures\signs\signs_maps.dm" #include "code\game\objects\structures\signs\signs_misc.dm" #include "code\game\objects\structures\signs\signs_warning.dm"