diff --git a/code/defines/obj/toy.dm b/code/defines/obj/toy.dm index c009061195f..9396c361ee1 100644 --- a/code/defines/obj/toy.dm +++ b/code/defines/obj/toy.dm @@ -250,4 +250,66 @@ obj/item/toy/blink var/shadeColour = "#220000" //RGB var/uses = 30 //0 for unlimited uses var/instant = 0 - var/colourName = "red" //for updateIcon purposes \ No newline at end of file + var/colourName = "red" //for updateIcon purposes + +/obj/item/toy/snappop + name = "snap pop" + desc = "Wow!" + icon = 'toy.dmi' + icon_state = "snappop" + + throw_impact(atom/hit_atom) + ..() + var/datum/effects/system/spark_spread/s = new /datum/effects/system/spark_spread + s.set_up(3, 1, src) + s.start() + new /obj/decal/ash(src.loc) + src.visible_message("\red The [src.name] explodes!","\red You hear a snap!") + playsound(src, 'snap.ogg', 50, 1) + del(src) + +/obj/item/toy/snappop/HasEntered(H as mob|obj) + if((ishuman(H))) //i guess carp and shit shouldn't set them off + var/mob/living/carbon/M = H + if(M.m_intent == "run") + M << "\red You step on the snap pop!" + + var/datum/effects/system/spark_spread/s = new /datum/effects/system/spark_spread + s.set_up(2, 0, src) + s.start() + new /obj/decal/ash(src.loc) + src.visible_message("\red The [src.name] explodes!","\red You hear a snap!") + playsound(src, 'snap.ogg', 50, 1) + del(src) + +/obj/item/toy/snappopbox + name = "snap pop box" + desc = "Eight wrappers of fun! Ages 8 and up. Not suitable for children." + icon = 'toy.dmi' + icon_state = "spbox" + var/amount = 8 + + attack_hand(mob/user as mob, unused, flag) + add_fingerprint(user) + + if(user.r_hand == src || user.l_hand == src) + if(amount) + var/obj/item/toy/snappop/M = new /obj/item/toy/snappop(src) + if (user.hand) + user.l_hand = M + else + user.r_hand = M + M.loc = user + M.layer = 20 + user.update_clothing() + user << "You take a snap pop out of the box." + amount-- + else + user << "There are no snap pops left in the box." + else + ..() + + return + + attack_paw(mob/user as mob) + return attack_hand(user) \ No newline at end of file diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index eb40a09ab4f..beed725d87d 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -101,29 +101,26 @@ if ((src.enemy_mp <= 0) || (src.enemy_hp <= 0)) src.gameover = 1 src.temp = "[src.enemy_name] has fallen! Rejoice!" - var/obj/item/prize var/prizeselect = pick(1,2,3,4,5,6,7,8) switch(prizeselect) if(1) - prize = new /obj/item/weapon/spacecash(src.loc) - prize.name = "space ticket" - prize.desc = "It's almost like actual currency!" + new /obj/item/toy/snappopbox(src.loc) if(2) - prize = new /obj/item/toy/blink(src.loc) + new /obj/item/toy/blink(src.loc) if(3) - prize = new /obj/item/clothing/under/syndicate/tacticool(src.loc) + new /obj/item/clothing/under/syndicate/tacticool(src.loc) if(4) - prize = new /obj/item/toy/sword(src.loc) + new /obj/item/toy/sword(src.loc) if(5) - prize = new /obj/item/toy/ammo/gun(src.loc) - prize = new /obj/item/toy/gun(src.loc) + new /obj/item/toy/ammo/gun(src.loc) + new /obj/item/toy/gun(src.loc) if(6) - prize = new /obj/item/toy/crossbow(src.loc) + new /obj/item/toy/crossbow(src.loc) if(7) - prize = new /obj/item/clothing/suit/syndicatefake(src.loc) - prize = new /obj/item/clothing/head/syndicatefake(src.loc) + new /obj/item/clothing/suit/syndicatefake(src.loc) + new /obj/item/clothing/head/syndicatefake(src.loc) if(8) - prize = new /obj/item/toy/crayonbox(loc) + new /obj/item/toy/crayonbox(loc) else if ((src.enemy_mp <= 5) && (prob(70))) diff --git a/icons/changelog.html b/icons/changelog.html index 75ad34a9904..9d487558fc8 100644 --- a/icons/changelog.html +++ b/icons/changelog.html @@ -23,17 +23,17 @@ w\:* {behavior:url(#default#VML);} Young Michael Young Michael - 3 - 15 + 4 + 16 2011-08-31T19:33:00Z - 2011-08-31T20:15:00Z + 2011-08-31T20:31:00Z 21 - 14444 - 82335 + 14458 + 82416 Brosoft 686 164 - 101113 + 101212 9.2720 @@ -2269,6 +2269,14 @@ should be listed in the changelog upon commit tho. Thanks. -->Snappops can now be acquired from + the arcade machines. Amaze your friends! (credit to Petethegoat) +
  • Bangindonk.ogg added to random end sounds list.
    • @@ -2368,8 +2376,8 @@ should be listed in the changelog upon commit tho. Thanks. --> leave z1 will count as dead so long as they are off of the z level.
  • Once a player has been - unconverted they may not be reconverted.
    • + style='font-family:"Times New Roman"'>Once a player has been unconverted + they may not be reconverted.
  • Cult:
    • @@ -2517,9 +2525,8 @@ should be listed in the changelog upon commit tho. Thanks. -->


    @@ -3464,10 +3472,10 @@ should be listed in the changelog upon commit tho. Thanks. --> presence of an element, while not directly consuming it.

  • Reactions changed to use - catalysts: all recipes that require Universal Enzyme now require 5 - units of the enzyme but the enzyme isn't consumed (So Tofu, Cheese, - Moonshine, Wine, Vodka, and Kahlua recipes).
    • + style='font-family:"Times New Roman"'>Reactions changed to use catalysts: + all recipes that require Universal Enzyme now require 5 units of the + enzyme but the enzyme isn't consumed (So Tofu, Cheese, Moonshine, Wine, + Vodka, and Kahlua recipes).
  • Smooth tables: Tables now automatically determine - which direction and sprite they'll use. They will connect to any - adjacent table unless there is a window between them (regular, + style='font-family:"Times New Roman"'>: Tables now automatically + determine which direction and sprite they'll use. They will connect to + any adjacent table unless there is a window between them (regular, reinforced, tinted, whichever)
    • @@ -3555,16 +3563,16 @@ should be listed in the changelog upon commit tho. Thanks. --> for that.
  • Because of Nanotransen being - Nanotransen, the fire cabinets are electrically operated. AIs can lock - them and you can hack them if you want the precious axe inside and it's - locked. The axe itself uses an experimental two-handed system, so while - it's FUCKING ROBUST you need to - wield it to fully unlock its capabilities. Pick up axe and click it in - your hand to wield it, click it again or drop to unwield and carry - it.You can also use it as a crowbar for cranking doors and firedoors - open when wielded, utilising the lever on the back of the blade. And I - didn't lie to you. It's fucking robust.
    • + style='font-family:"Times New Roman"'>Because of Nanotransen being Nanotransen, + the fire cabinets are electrically operated. AIs can lock them and you + can hack them if you want the precious axe inside and it's locked. The + axe itself uses an experimental two-handed system, so while it's FUCKING ROBUST you need to wield it to + fully unlock its capabilities. Pick up axe and click it in your hand to + wield it, click it again or drop to unwield and carry it.You can also + use it as a crowbar for cranking doors and firedoors open when wielded, + utilising the lever on the back of the blade. And I didn't lie to you. + It's fucking robust.
  • Fireaxe, when wielded, fully @@ -3685,8 +3693,8 @@ should be listed in the changelog upon commit tho. Thanks. --> understandable!
  • Brobot merged with Service Borg - with a Rapid Service Fabricator.
    • + style='font-family:"Times New Roman"'>Brobot merged with Service Borg with + a Rapid Service Fabricator.
  • Arcade machine prizes look and @@ -3779,9 +3787,9 @@ should be listed in the changelog upon commit tho. Thanks. --> access level. (Also fixed xeno pen access and blast doors)
  • You might soon start to see - different airlocks and airlock assemblies around the station. (Sprites - donated by Baystation 12)
    • + style='font-family:"Times New Roman"'>You might soon start to see different + airlocks and airlock assemblies around the station. (Sprites donated by + Baystation 12)
  • Chemical storage added, @@ -3863,8 +3871,8 @@ should be listed in the changelog upon commit tho. Thanks. --> through r-walls, walls take 7 seconds to cut through.
  • Turrets are now destructible. Bash - them with stuff when they pop out or (more likely) die trying.
    • + style='font-family:"Times New Roman"'>Turrets are now destructible. + Bash them with stuff when they pop out or (more likely) die trying.
  • Updated Ripley Mech sprite.
    • @@ -4260,8 +4268,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
  • into money bags, also fixed money bag interaction window formatting.
  • QM no longer has access to the entire - mining station to stop him from stealing supplies.
    • + style='font-family:"Times New Roman"'>QM no longer has access to the + entire mining station to stop him from stealing supplies.
  • New machine loading sprite for @@ -4453,9 +4460,9 @@ should be listed in the changelog upon commit tho. Thanks. -->
  • Service Cyborgs can be picked! - Shaker, dropper, tray, pen, paper, and DOSH to show their class off. - When emagged, the friendly butler-borg is able to serve up a deadly - last meal.
    • + Shaker, dropper, tray, pen, paper, and DOSH to show their class off. When + emagged, the friendly butler-borg is able to serve up a deadly last + meal.
  • It should now be possible to @@ -4618,8 +4625,8 @@ should be listed in the changelog upon commit tho. Thanks. --> windows bug where they weren't properly unfastened and unscrewed.
  • Examination room has a few - windows now.
    • + style='font-family:"Times New Roman"'>Examination room has a few windows + now.
  • Can you tell I reinstalled @@ -4651,9 +4658,9 @@ should be listed in the changelog upon commit tho. Thanks. -->
    Sunday, November 14, 18:05
    -
    Sunday, October 10, - 14:25(GMT)
    +
    Sunday, October 10, 14:25(GMT)
    Saturday, July 10, 15:10