diff --git a/code/game/objects/effects/barsign.dm b/code/game/objects/effects/barsign.dm deleted file mode 100644 index fd66f8028d..0000000000 --- a/code/game/objects/effects/barsign.dm +++ /dev/null @@ -1,8 +0,0 @@ -/obj/effect/sign/double/barsign - icon = 'icons/obj/barsigns.dmi' - icon_state = "empty" - anchored = 1 - - New() - var/list/valid_states = list("pinkflamingo", "magmasea", "limbo", "rustyaxe", "armokbar", "brokendrum", "meadbay", "thedamnwall", "thecavern", "cindikate", "theorchard", "thesaucyclown", "theclownshead", "whiskeyimplant", "carpecarp", "robustroadhouse", "greytide", "theredshirt") - src.icon_state = "[pick(valid_states)]" diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index 4a9b2f7ecd..8ef3fd463d 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -3,7 +3,7 @@ icon_state = "empty" anchored = 1 New() - ChangeSign(pick("pinkflamingo", "magmasea", "limbo", "rustyaxe", "armokbar", "brokendrum", "meadbay", "thedamnwall", "thecavern", "cindikate", "theorchard", "thesaucyclown", "theclownshead")) + ChangeSign(pick("pinkflamingo", "magmasea", "limbo", "rustyaxe", "armokbar", "brokendrum", "meadbay", "thedamnwall", "thecavern", "cindikate", "theorchard", "thesaucyclown", "theclownshead", "whiskeyimplant", "carpecarp", "robustroadhouse", "greytide", "theredshirt")) return proc/ChangeSign(var/Text) src.icon_state = "[Text]" @@ -15,7 +15,7 @@ if(istype(I, /obj/item/weapon/card/id)) var/obj/item/weapon/card/id/card = I if(access_bar in card.GetAccess()) - var/sign_type = input(user, "What would you like to change the barsign to?") as null|anything in list("Pink Flamingo", "Magma Sea", "Limbo", "Rusty Axe", "Armok Bar", "Broken Drum", "Mead Bay", "The Damn Wall", "The Cavern", "Cindi Kate", "The Orchard", "The Saucy Clown", "The Clowns Head") + var/sign_type = input(user, "What would you like to change the barsign to?") as null|anything in list("Off", "Pink Flamingo", "Magma Sea", "Limbo", "Rusty Axe", "Armok Bar", "Broken Drum", "Mead Bay", "The Damn Wall", "The Cavern", "Cindi Kate", "The Orchard", "The Saucy Clown", "The Clowns Head", "Whiskey Implant", "Carpe Carp", "Robust Roadhouse", "Greytide", "The Redshirt") if(sign_type == null) return else diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 1d32869fb1..71cc5ad851 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -3,7 +3,7 @@ var/list/department_radio_keys = list( ":l" = "left ear", "#l" = "left ear", ".l" = "left ear", ":i" = "intercom", "#i" = "intercom", ".i" = "intercom", ":h" = "department", "#h" = "department", ".h" = "department", - ":0" = "special", "#0" = "special", ".0" = "special", //activate radio-specific special functions + ":+" = "special", "#+" = "special", ".+" = "special", //activate radio-specific special functions ":c" = "Command", "#c" = "Command", ".c" = "Command", ":n" = "Science", "#n" = "Science", ".n" = "Science", ":m" = "Medical", "#m" = "Medical", ".m" = "Medical", diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 45fb2cc107..9360e758a1 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -43,6 +43,4 @@ client.perspective = EYE_PERSPECTIVE else client.eye = src - client.perspective = MOB_PERSPECTIVE - - nanomanager.send_resources(client) \ No newline at end of file + client.perspective = MOB_PERSPECTIVE \ No newline at end of file diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm index 076c82b677..235c4ce724 100644 --- a/code/modules/mob/new_player/login.dm +++ b/code/modules/mob/new_player/login.dm @@ -29,6 +29,5 @@ new_player_panel() spawn(40) if(client) - nanomanager.send_resources(client) handle_privacy_poll() client.playtitlemusic() diff --git a/icons/obj/barsigns.dmi b/icons/obj/barsigns.dmi index 72b438b2dd..a46f12357a 100644 Binary files a/icons/obj/barsigns.dmi and b/icons/obj/barsigns.dmi differ