From a462fb21e0438a91e31e42df3abd2747b73cd06c Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Mon, 23 Nov 2015 12:18:35 -0500 Subject: [PATCH] Minor fixes. --- code/game/objects/items/toys.dm | 44 +++++---------------------------- 1 file changed, 6 insertions(+), 38 deletions(-) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index ec1f472460a..a2539225f9a 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1456,159 +1456,137 @@ obj/item/toy/cards/deck/syndicate/black var/cooldown = 0 var/toysay = "What the fuck did you do?" +/obj/item/toy/figure/New() + desc = "A \"Space Life\" brand [name]" + /obj/item/toy/figure/attack_self(mob/user as mob) - if( cooldown < world.time ) + if(cooldown < world.time) cooldown = (world.time + 30) //3 second cooldown user << "The [src] says \"[toysay]\"." playsound(user, 'sound/machines/click.ogg', 20, 1) /obj/item/toy/figure/cmo name = "Chief Medical Officer action figure" - desc = "A \"Space Life\" brand Chief Medical Officer action figure." icon_state = "cmo" toysay = "Suit sensors!" /obj/item/toy/figure/assistant name = "Assistant action figure" - desc = "A \"Space Life\" brand Assistant action figure." icon_state = "assistant" - toysay = "Grey tide world wide!" + toysay = "Grey tide station wide!" /obj/item/toy/figure/atmos name = "Atmospheric Technician action figure" - desc = "A \"Space Life\" brand Atmospheric Technician action figure." icon_state = "atmos" toysay = "Glory to Atmosia!" /obj/item/toy/figure/bartender name = "Bartender action figure" - desc = "A \"Space Life\" brand Bartender action figure." icon_state = "bartender" toysay = "Wheres my monkey?" /obj/item/toy/figure/borg name = "Cyborg action figure" - desc = "A \"Space Life\" brand Cyborg action figure." icon_state = "borg" toysay = "I. LIVE. AGAIN." /obj/item/toy/figure/botanist name = "Botanist action figure" - desc = "A \"Space Life\" brand Botanist action figure." icon_state = "botanist" toysay = "Dude, I see colors..." /obj/item/toy/figure/captain name = "Captain action figure" - desc = "A \"Space Life\" brand Captain action figure." icon_state = "captain" toysay = "Crew, the Nuke Disk is safely up my ass." /obj/item/toy/figure/cargotech name = "Cargo Technician action figure" - desc = "A \"Space Life\" brand Cargo Technician action figure." icon_state = "cargotech" toysay = "For Cargonia!" /obj/item/toy/figure/ce name = "Chief Engineer action figure" - desc = "A \"Space Life\" brand Chief Engineer action figure." icon_state = "ce" toysay = "Wire the solars!" /obj/item/toy/figure/chaplain name = "Chaplain action figure" - desc = "A \"Space Life\" brand Chaplain action figure." icon_state = "chaplain" toysay = "Gods make me a killing machine please!" /obj/item/toy/figure/chef name = "Chef action figure" - desc = "A \"Space Life\" brand Chef action figure." icon_state = "chef" toysay = "I swear it's not human meat." /obj/item/toy/figure/chemist name = "Chemist action figure" - desc = "A \"Space Life\" brand Chemist action figure." icon_state = "chemist" toysay = "Get your pills!" /obj/item/toy/figure/clown name = "Clown action figure" - desc = "A \"Space Life\" brand Clown action figure." icon_state = "clown" toysay = "Honk!" /obj/item/toy/figure/ian name = "Ian action figure" - desc = "A \"Space Life\" brand Ian action figure." icon_state = "ian" toysay = "Arf!" /obj/item/toy/figure/detective name = "Detective action figure" - desc = "A \"Space Life\" brand Detective action figure." icon_state = "detective" toysay = "This airlock has grey jumpsuit and insulated glove fibers on it." /obj/item/toy/figure/dsquad name = "Death Squad Officer action figure" - desc = "A \"Space Life\" brand Death Squad Officer action figure." icon_state = "dsquad" toysay = "Eliminate all threats!" /obj/item/toy/figure/engineer name = "Engineer action figure" - desc = "A \"Space Life\" brand Engineer action figure." icon_state = "engineer" toysay = "Oh god, the singularity is loose!" /obj/item/toy/figure/geneticist name = "Geneticist action figure" - desc = "A \"Space Life\" brand Geneticist action figure." icon_state = "geneticist" toysay = "I'm not qualified for this job." /obj/item/toy/figure/hop - name = "Head of Personel action figure" - desc = "A \"Space Life\" brand Head of Personel action figure." + name = "Head of Persomnel action figure" icon_state = "hop" toysay = "Giving out all access!" /obj/item/toy/figure/hos name = "Head of Security action figure" - desc = "A \"Space Life\" brand Head of Security action figure." icon_state = "hos" toysay = "I'm here to win, anything else is secondary." /obj/item/toy/figure/qm name = "Quartermaster action figure" - desc = "A \"Space Life\" brand Quartermaster action figure." icon_state = "qm" toysay = "Hail Cargonia!" /obj/item/toy/figure/janitor name = "Janitor action figure" - desc = "A \"Space Life\" brand Janitor action figure." icon_state = "janitor" toysay = "Look at the signs, you idiot." /obj/item/toy/figure/lawyer name = "Lawyer action figure" - desc = "A \"Space Life\" brand Lawyer action figure." icon_state = "lawyer" toysay = "My client is a dirty traitor!" /obj/item/toy/figure/librarian name = "Librarian action figure" - desc = "A \"Space Life\" brand Librarian action figure." icon_state = "librarian" toysay = "One day while..." /obj/item/toy/figure/md name = "Medical Doctor action figure" - desc = "A \"Space Life\" brand Medical Doctor action figure." icon_state = "md" toysay = "The patient is already dead!" @@ -1620,60 +1598,50 @@ obj/item/toy/cards/deck/syndicate/black /obj/item/toy/figure/miner name = "Shaft Miner action figure" - desc = "A \"Space Life\" brand Shaft Miner action figure." icon_state = "miner" toysay = "Oh god it's eating my intestines!" /obj/item/toy/figure/ninja name = "Ninja action figure" - desc = "A \"Space Life\" brand Ninja action figure." icon_state = "ninja" toysay = "Oh god! Stop shooting, I'm friendly!" /obj/item/toy/figure/wizard name = "Wizard action figure" - desc = "A \"Space Life\" brand Wizard action figure." icon_state = "wizard" toysay = "Ei Nath!" /obj/item/toy/figure/rd name = "Research Director action figure" - desc = "A \"Space Life\" brand Research Director action figure." icon_state = "rd" toysay = "Blowing all of the borgs!" /obj/item/toy/figure/roboticist name = "Roboticist action figure" - desc = "A \"Space Life\" brand Roboticist action figure." icon_state = "roboticist" toysay = "He asked to be borged!" /obj/item/toy/figure/scientist name = "Scientist action figure" - desc = "A \"Space Life\" brand Scientist action figure." icon_state = "scientist" toysay = "Someone else must have made those bombs!" /obj/item/toy/figure/syndie name = "Nuclear Operative action figure" - desc = "A \"Space Life\" brand Nuclear Operative action figure." icon_state = "syndie" toysay = "Get that fucking disk!" /obj/item/toy/figure/secofficer name = "Security Officer action figure" - desc = "A \"Space Life\" brand Security Officer action figure." icon_state = "secofficer" toysay = "I am the law!" /obj/item/toy/figure/virologist name = "Virologist action figure" - desc = "A \"Space Life\" brand Virologist action figure." icon_state = "virologist" toysay = "The cure is potassium!" /obj/item/toy/figure/warden name = "Warden action figure" - desc = "A \"Space Life\" brand Warden action figure." icon_state = "warden" toysay = "Execute him for breaking in!" \ No newline at end of file