Merge pull request #450 from ZomgPonies/fixuns

More fixins and various features

code/game/machinery/computer/arcade.dm

@@ -31,6 +31,8 @@
 							/obj/item/toy/carpplushie						= 2,
 							/obj/item/toy/minimeteor						= 2,
 							/obj/item/toy/redbutton							= 2,
+							/obj/item/toy/owl								= 2,
+							/obj/item/toy/griffin							= 2,
 							/obj/item/clothing/head/blob					= 2,
 							/obj/item/weapon/id_decal/gold					= 2,
 							/obj/item/weapon/id_decal/silver				= 2,
@@ -145,7 +147,7 @@
 /obj/machinery/computer/arcade/battle/Topic(href, href_list)
 	if(..())
 		return 1
-		
+
 	if(usr.machine != src)
 		return 0
 

code/game/objects/effects/decals/posters/tgposters.dm

@@ -103,3 +103,13 @@
 	name = "Borg Fancy v2"
 	desc = "Borg Fancy, Now only taking the most fancy."
 	icon_state="poster21"
+
+/datum/poster/tg_22
+	name = "The Griffin"
+	desc = " The Griffin commands you to be the worst you can be. Will you?"
+	icon_state="poster22"
+
+/datum/poster/tg_23
+	name = "The Owl"
+	desc = " The Owl would do his best to protect the station. Will you?"
+	icon_state="poster23"

code/game/objects/items/toys.dm

@@ -1124,4 +1124,43 @@ obj/item/toy/cards/deck/syndicate/black
 				shake_camera(M, 2, 1) // Shakes player camera 2 squares for 1 second.
 
 	else
-		user << "<span class='alert'>Nothing happens.</span>"
+		user << "<span class='alert'>Nothing happens.</span>"
+
+
+/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 << "<span class='notice'>You pull the string on the [src].</span>"
+		playsound(user, 'sound/machines/click.ogg', 20, 1)
+		src.loc.visible_message("<span class='danger'>\icon[src] [message]</span>")
+		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 << "<span class='notice'>You pull the string on the [src].</span>"
+		playsound(user, 'sound/machines/click.ogg', 20, 1)
+		src.loc.visible_message("<span class='danger'>\icon[src] [message]</span>")
+		cooldown = 1
+		spawn(30) cooldown = 0
+		return
+	..()

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","lv426", "zocalo", "4theemprah", "ishimura", "tardis", "quarks", "tenforward", "thepranicngpony", "vault13", "solaris", "thehive", "cantina", "theouterspess", "milliways42", "thetimeofeve", "spaceasshole", "dwarffortress"))
+		ChangeSign(pick("magmasea", "limbo", "rustyaxe", "armokbar", "brokendrum", "meadbay", "thecavern", "cindikate", "theorchard", "lv426", "zocalo", "4theemprah", "ishimura", "tardis", "quarks", "tenforward", "thepranicngpony", "vault13", "solaris", "thehive", "cantina", "theouterspess", "milliways42", "thetimeofeve", "spaceasshole", "dwarffortress", "thebark", "thedrunkcarp", "theharmbaton", "thenest", "officerbeersky", "thesingulo"))
 		return
 	proc/ChangeSign(var/Text)
 		src.icon_state = "[Text]"

code/modules/mob/living/silicon/robot/drone/drone.dm

@@ -25,7 +25,7 @@
 
 	//Used for self-mailing.
 	var/mail_destination = 0
-	var/sprite[0]
+//	var/sprite[0]
 
 
 /mob/living/silicon/robot/drone/New()
@@ -275,6 +275,7 @@
 	src << "<b>Don't invade their worksites, don't steal their resources, don't tell them about the changeling in the toilets.</b>"
 	src << "<b>If a crewmember has noticed you, <i>you are probably breaking your first law</i></b>."
 
+/*
 	sprite["Default"] = "repairbot"
 	sprite["Mk2 Mousedrone"] = "mk2"
 	sprite["Mk3 Monkeydrone"] = "mk3"
@@ -284,6 +285,8 @@
 	updateicon()
 
 	choose_icon(6,sprite)
+*/
+
 
 /mob/living/silicon/robot/drone/Bump(atom/movable/AM as mob|obj, yes)
 	if (!yes || ( \