diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index 0b29594604b..41a450d2fee 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -66,7 +66,7 @@ /obj/structure/sign/double/barsign/attackby(obj/item/I, mob/user) if(cult) - return ..() + return ..() var/obj/item/card/id/card = I.GetID() if(istype(card)) if(check_access(card)) @@ -92,82 +92,82 @@ /decl/sign/double/bar/whiskey_implant name = "Whiskey Implant" - icon_state = "Whiskey Implant" + icon_state = "Whiskey Implant" desc = "A hit on modern extensive augmentations." desc_fluff = "Some people would probably argue, that an implant which injects you some whiskey in certain situations, would probably make the galaxy a better place for everyone." /decl/sign/double/bar/the_drunk_carp name = "The Drunk Carp" - icon_state = "The Drunk Carp" + icon_state = "The Drunk Carp" desc = "A depiction of a stylized space carp drinking a beer." desc_fluff = "A depiction of 'Ivan the Space Carp' from the popular children's show of the same name. As the name suggests, Ivan has a heavy drinking problem." /decl/sign/double/bar/the_outer_spess name = "The Outer Spess" - icon_state = "The Outer Spess" + icon_state = "The Outer Spess" desc = "A long running joke between spacemen, which never gets old." desc_fluff = "It's almost tradition to call the great unknown of the universe 'spess'. No one really knows anymore where this joke comes from nor does anyone care. It's also not important, probably." /decl/sign/double/bar/officer_beersky name = "Officer Beersky" - icon_state = "Officer Beersky" + icon_state = "Officer Beersky" desc = "To remember the hero, lost along the way, Officer Beepsky." desc_fluff = "To commemorate the great accomplishments and never ending duty of the ISD's small security robot Officer Beepsky. Gone, but not forgotten." /decl/sign/double/bar/ishimura name = "Ishimura" - icon_state = "Ishimura" + icon_state = "Ishimura" desc = "Named after a famous solarian physicist." desc_fluff = "Hideki Ishimura was a famous solarian astrophysicist, responsible for some great scientific achievements from a time long gone." /decl/sign/double/bar/foreign name = "Foreign" - icon_state = "Foreign" + icon_state = "Foreign" desc = "A sign, designed in a classic estern-asian design, originating from Earth." desc_fluff = "Earth's eastern asian culture brought forward a greatly varied and loved style of cuisine, still eaten today. This sign looks like one of the many signs that come to mind, when thinking about this." /decl/sign/double/bar/hearts_of_plasteel name = "Hearts of Plasteel" - icon_state = "Hearts of Plasteel" + icon_state = "Hearts of Plasteel" desc = "The sign of a diner from a famous TV show." desc_fluff = "This sign is a replication of the diner sign, which the military-comedy show 'Hearts of Plasteel' revolves around. Loved by fans universe-wide." /decl/sign/double/bar/the_lightbulb name = "The Lightbulb" - icon_state = "The Lightbulb" + icon_state = "The Lightbulb" desc = "The Lightbulb, a famous scene-bar and club in Mendell City." desc_fluff = "The Lightbulb is one of the top hidden gems in Mendell City, if you want to party. Known for it's expansive dance floors and planet-wide renowned bartenders, the Lightbulb is a once in a lifetime experience." /decl/sign/double/bar/chem_lab name = "Chem Lab" - icon_state = "Chem Lab" + icon_state = "Chem Lab" desc = "Chem Labs are the unofficial name given to some eridanian bars." desc_fluff = "Underground, hidden or less known bars in Eridani, where almost exclusively Dregs or other 'Unwanted' frequent are unofficially called Chem Labs, not only due to the dubious origin of the alcohol served there." /decl/sign/double/bar/meow_mix name = "Meow Mix" - icon_state = "Meow Mix" + icon_state = "Meow Mix" desc = "A sign with a selection of some of the SCC's much beloved pets." desc_fluff = "Two cats, named Bones and Nickel are depicted on this sign. They are much beloved mascotts, raising morale and work efficiency whereever they are." /decl/sign/double/bar/the_hive name = "The Hive" - icon_state = "The Hive" + icon_state = "The Hive" desc = "A wildly known, high class eridanian cocktail bar chain." - desc_fluff = "The Hive, known for its expensive and extravagant drinks, this bar chain is known as the place to be with your suit friends, when visiting Epsilon Eridani." + desc_fluff = "The Hive, known for its expensive and extravagant drinks, this bar chain is known as the place to be with your suit friends, when visiting Eridani I." /decl/sign/double/bar/mead_bay name = "Mead Bay" - icon_state = "Mead Bay" + icon_state = "Mead Bay" desc = "The Mead Bay is the alternative for visiting an actual Medbay." desc_fluff = "Another long running joke among spacefarers. A bandage from the Medbay may mend your body, but a good drink from the Mead Bay together with your colleagues really mends your soul." /decl/sign/double/bar/toolbox_tavern name = "Toolbox Tavern" - icon_state = "Toolbox Tavern" + icon_state = "Toolbox Tavern" desc = "A popular bar at an Hepheastus Industries shipyard." desc_fluff = "The name of the after-hours bar, located at the Hepheastus Industries shipyard the Horizon was built. To remember the great lengths and sacrifices that were made to bring this vessel to life." /decl/sign/double/bar/maltese_falcon name = "Maltese Falcon" - icon_state = "Maltese Falcon" + icon_state = "Maltese Falcon" desc = "A recreation of the famous Maltese Falcon bar sign." desc_fluff = "An exact replica of the sign, which is hanging over the entrance of the famous Maltese Falcon Bar & Grill. A safe heaven for every pilot, captain or crewman of any vessel, looking to take a break." /decl/sign/double/bar/old_cock_inn name = "Old Cock Inn" - icon_state = "Old Cock Inn" + icon_state = "Old Cock Inn" desc = "The sign of a formerly well-known discotheque." desc_fluff = "The Old Cock Inn was a discotheque, from times long gone. Formerly known as 'Old Richard's Inn' no one can remember much about it, but the name has persisted over the decades." /decl/sign/double/bar/commie name = "People's Preferred" - icon_state = "Commie" + icon_state = "Commie" desc = "The name of a bar, located at Pluto's biggest spaceport." desc_fluff = "People's Preferred is the name of the drinking hole at Pluto's biggest spaceport. Everyone stops there and everyone loves it there. It's what the people prefer, apparently." /decl/sign/double/kitchen/event_horizon // Start of the kitchen signs. Don't mix it up. @@ -175,6 +175,16 @@ icon_state = "Event Horizon" desc = "The SCCV Horizon's kitchen franchise sign." desc_fluff = "The SCCV Horizon's dining area was the testing ground for the SCC to experiment with food franchising. The goal was to provide better food perparing processes, food quality and, of course, to maybe capitalize on this. To remember where it all started, the name 'Event Horizon' was chosen." +/decl/sign/double/kitchen/paradise_sands + name = "Paradise Sands" + icon_state = "Paradise Sands" + desc = "A take on the sign of one of Silversun's most popular cafe and bistro owned by Idris Incorporated." + desc_fluff = "Paradise Sands is the name of one of the most popular cafe- and bistro places on all of Silversun. Located in a secluded cove, you can brunch, drink, and swim at a beach with white sand and a deep, azure ocean; a paradise." +/decl/sign/double/kitchen/city_alive + name = "City Alive" + icon_state = "City Alive" + desc = "City Alive is another popular restaurant chain, originating from Eridani I. It is famous for its light shows." + desc_fluff = "City Alive is a high class restaurant chain, dotted all over Eridani I and III. Especially on Eridani I they are also famous for their light shows in the evenings. These lights look like pulsating veins, making the city seem alive, especially when observed from orbit." /obj/structure/sign/double/barsign/proc/get_sign_choices() var/list/sign_choices = decls_repository.get_decls_of_subtype(choice_types) @@ -192,7 +202,7 @@ if(!sign_choice) return var/decl/sign/double/signselect = sign_index[sign_choice] - + name = signselect.name desc = signselect.desc desc_fluff = signselect.desc_fluff diff --git a/html/changelogs/KingOfThePing - kitchensigns_my_beloved.yml b/html/changelogs/KingOfThePing - kitchensigns_my_beloved.yml new file mode 100644 index 00000000000..949d2e6025d --- /dev/null +++ b/html/changelogs/KingOfThePing - kitchensigns_my_beloved.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: KingOfThePing, TheLancer + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added two new, animated kitchen signs. Paradise Sands from Silversun and City Alive from Eridani I." + - tweak: "Tweaked one bar sign description to align with recent Eridani lore changes." diff --git a/icons/obj/kitchensigns.dmi b/icons/obj/kitchensigns.dmi index 0b0205a3146..9a2010dccdf 100644 Binary files a/icons/obj/kitchensigns.dmi and b/icons/obj/kitchensigns.dmi differ