diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 7f1f9bdb3ed..1bcc4decc8e 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -29,7 +29,9 @@ /obj/item/toy/minimeteor = 2, /obj/item/toy/carpplushie = 2, /obj/item/toy/foamblade = 2, - /obj/item/toy/redbutton = 2 + /obj/item/toy/redbutton = 2, + /obj/item/toy/owl = 2, + /obj/item/toy/griffin = 2 ) /obj/machinery/computer/arcade/New() diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index 6d60db1b4cd..ed8de67de1f 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -1,9 +1,9 @@ //########################## CONTRABAND ;3333333333333333333 -Agouri ################################################### -#define NUM_OF_POSTER_DESIGNS 32 //subtype 0-contraband posters +#define NUM_OF_POSTER_DESIGNS 33 //subtype 0-contraband posters -#define NUM_OF_POSTER_DESIGNS_LEGIT 32 //subtype 1-corporate approved posters +#define NUM_OF_POSTER_DESIGNS_LEGIT 33 //subtype 1-corporate approved posters /obj/item/weapon/contraband name = "contraband item" @@ -188,6 +188,9 @@ obj/structure/sign/poster/New(serial,subtype) if(32) name += " - Punch Shit" desc += " Fight things for no reason, like a man!" + if(33) + name += " - The Griffin" + desc += " The Griffin commands you to be the worst you can be. Will you?" else name += " - Error (subtype 0 serial_number)" desc += " This is a bug, please report the circumstances under which you encountered this poster at https://github.com/tgstation/-tg-station/issues." @@ -291,6 +294,9 @@ obj/structure/sign/poster/New(serial,subtype) if(32) name += " - High-Class Martini" desc += " I told you to shake it, no stirring" + if(33) + name += " - The Owl" + desc += " The Owl would do his best to protect the station. Will you?" else name += " - Error (subtype 1 serial_number)" desc += " This is a bug, please report the circumstances under which you encountered this poster at https://github.com/NTStation/NTstation13/issues." diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 12c3e59e172..585ebf2b90d 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -686,7 +686,43 @@ return ..() +/obj/item/toy/owl + name = "owl action figure" + desc = "An action figure modeled after 'The Owl', defender of justice." + icon = 'icons/obj/toy.dmi' + icon_state = "owlprize" + w_class = 2.0 + var/cooldown = 0 +/obj/item/toy/owl/attack_self(mob/user) + if(!cooldown) //for the sanity of everyone + var/message = pick("You won't get away this time, Griffin!", "Stop right there, criminal!", "Hoot! Hoot!", "I am the night!") + user << "You pull the string on the [src]." + playsound(user, 'sound/machines/click.ogg', 20, 1) + src.loc.visible_message("\icon[src] [message]") + cooldown = 1 + spawn(30) cooldown = 0 + return + ..() + +/obj/item/toy/griffin + name = "griffin action figure" + desc = "An action figure modeled after 'The Griffin', criminal mastermind." + icon = 'icons/obj/toy.dmi' + icon_state = "griffinprize" + w_class = 2.0 + var/cooldown = 0 + +/obj/item/toy/griffin/attack_self(mob/user) + if(!cooldown) //for the sanity of everyone + var/message = pick("You can't stop me, Owl!", "My plan is flawless! The vault is mine!", "Caaaawwww!", "You will never catch me!") + user << "You pull the string on the [src]." + playsound(user, 'sound/machines/click.ogg', 20, 1) + src.loc.visible_message("\icon[src] [message]") + cooldown = 1 + spawn(30) cooldown = 0 + return + ..() /* diff --git a/code/game/objects/structures/barsigns.dm b/code/game/objects/structures/barsigns.dm index b578631912b..bba78e8c29b 100644 --- a/code/game/objects/structures/barsigns.dm +++ b/code/game/objects/structures/barsigns.dm @@ -119,4 +119,9 @@ /datum/barsign/honkednloaded name = "Honked 'n' Loaded" icon = "honkednloaded" - desc = "Honk." \ No newline at end of file + desc = "Honk." + +/datum/barsign/thenest + name = "The Nest" + icon = "thenest" + desc = "A good place to retire for a drink after a night of crime fighting." \ No newline at end of file diff --git a/icons/obj/barsigns.dmi b/icons/obj/barsigns.dmi index ce25b56f081..9fd008228db 100644 Binary files a/icons/obj/barsigns.dmi and b/icons/obj/barsigns.dmi differ diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi index 03f6c8d17f8..3e03b1b7155 100644 Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index 90a2579ab6a..5c62c63a925 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ