diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 445c0b743ab..7277bc6a366 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -29,10 +29,10 @@
prize_amount = score
else
prize_amount = rand(1, 10)
- new prize(src.loc, prize_amount)
+ new prize(get_turf(src), prize_amount)
else
var/atom/movable/prize = pick(contents)
- prize.loc = src.loc
+ prize.loc = get_turf(src)
/obj/machinery/computer/arcade/emp_act(severity)
..(severity)
@@ -46,7 +46,7 @@
num_of_prizes = rand(0,2)
for(var/i = num_of_prizes; i > 0; i--)
prizevend()
- explosion(src.loc, -1, 0, 1+num_of_prizes, flame_range = 1+num_of_prizes)
+ explosion(get_turf(src), -1, 0, 1+num_of_prizes, flame_range = 1+num_of_prizes)
/obj/machinery/computer/arcade/battle
@@ -75,20 +75,20 @@
name_part1 = pick("the Automatic ", "Farmer ", "Lord ", "Professor ", "the Cuban ", "the Evil ", "the Dread King ", "the Space ", "Lord ", "the Great ", "Duke ", "General ")
name_part2 = pick("Melonoid", "Murdertron", "Sorcerer", "Ruin", "Jeff", "Ectoplasm", "Crushulon", "Uhangoid", "Vhakoid", "Peteoid", "slime", "Griefer", "ERPer", "Lizard Man", "Unicorn", "Bloopers")
- src.enemy_name = replacetext((name_part1 + name_part2), "the ", "")
- src.name = (name_action + name_part1 + name_part2)
+ enemy_name = replacetext((name_part1 + name_part2), "the ", "")
+ name = (name_action + name_part1 + name_part2)
/obj/machinery/computer/arcade/battle/attack_hand(mob/user as mob)
if(..())
return
user.set_machine(src)
var/dat = "Close"
- dat += "[src.enemy_name]
"
+ dat += "[enemy_name]
"
- dat += "
[src.temp]
"
- dat += "
Health: [src.player_hp] | Magic: [src.player_mp] | Enemy Health: [src.enemy_hp]"
+ dat += "
[temp]
"
+ dat += "
Health: [player_hp] | Magic: [player_mp] | Enemy Health: [enemy_hp]"
- if (src.gameover)
+ if (gameover)
dat += "New Game"
else
dat += "Attack | "
@@ -101,7 +101,7 @@
//onclose(user, "arcade")
var/datum/browser/popup = new(user, "arcade", "Space Villian 2000")
popup.set_content(dat)
- popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
+ popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
popup.open()
return
@@ -109,48 +109,48 @@
if(..())
return
- if (!src.blocked && !src.gameover)
+ if (!blocked && !gameover)
if (href_list["attack"])
- src.blocked = 1
+ blocked = 1
var/attackamt = rand(2,6)
- src.temp = "You attack for [attackamt] damage!"
+ temp = "You attack for [attackamt] damage!"
playsound(src.loc, 'sound/arcade/Hit.ogg', 20, 1, extrarange = -6, falloff = 10)
- src.updateUsrDialog()
+ updateUsrDialog()
if(turtle > 0)
turtle--
sleep(10)
- src.enemy_hp -= attackamt
- src.arcade_action()
+ enemy_hp -= attackamt
+ arcade_action()
else if (href_list["heal"])
- src.blocked = 1
+ blocked = 1
var/pointamt = rand(1,3)
var/healamt = rand(6,8)
- src.temp = "You use [pointamt] magic to heal for [healamt] damage!"
+ temp = "You use [pointamt] magic to heal for [healamt] damage!"
playsound(src.loc, 'sound/arcade/Heal.ogg', 20, 1, extrarange = -6, falloff = 10)
- src.updateUsrDialog()
+ updateUsrDialog()
turtle++
sleep(10)
- src.player_mp -= pointamt
- src.player_hp += healamt
- src.blocked = 1
- src.updateUsrDialog()
- src.arcade_action()
+ player_mp -= pointamt
+ player_hp += healamt
+ blocked = 1
+ updateUsrDialog()
+ arcade_action()
else if (href_list["charge"])
- src.blocked = 1
+ blocked = 1
var/chargeamt = rand(4,7)
- src.temp = "You regain [chargeamt] points"
+ temp = "You regain [chargeamt] points"
playsound(src.loc, 'sound/arcade/Mana.ogg', 20, 1, extrarange = -6, falloff = 10)
- src.player_mp += chargeamt
+ player_mp += chargeamt
if(turtle > 0)
turtle--
- src.updateUsrDialog()
+ updateUsrDialog()
sleep(10)
- src.arcade_action()
+ arcade_action()
if (href_list["close"])
usr.unset_machine()
@@ -166,50 +166,50 @@
turtle = 0
if(emagged)
- src.New()
+ New()
emagged = 0
- src.add_fingerprint(usr)
- src.updateUsrDialog()
+ add_fingerprint(usr)
+ updateUsrDialog()
return
/obj/machinery/computer/arcade/battle/proc/arcade_action()
- if ((src.enemy_mp <= 0) || (src.enemy_hp <= 0))
+ if ((enemy_mp <= 0) || (enemy_hp <= 0))
if(!gameover)
- src.gameover = 1
- src.temp = "[src.enemy_name] has fallen! Rejoice!"
+ gameover = 1
+ temp = "[enemy_name] has fallen! Rejoice!"
playsound(src.loc, 'sound/arcade/Win.ogg', 20, 1, extrarange = -6, falloff = 10)
if(emagged)
feedback_inc("arcade_win_emagged")
- new /obj/effect/spawner/newbomb/timer/syndicate(src.loc)
- new /obj/item/clothing/head/collectable/petehat(src.loc)
+ new /obj/effect/spawner/newbomb/timer/syndicate(get_turf(src))
+ new /obj/item/clothing/head/collectable/petehat(get_turf(src))
message_admins("[key_name_admin(usr)] has outbombed Cuban Pete and been awarded a bomb.")
log_game("[key_name(usr)] has outbombed Cuban Pete and been awarded a bomb.")
- src.New()
+ New()
emagged = 0
else
feedback_inc("arcade_win_normal")
- var/score = src.player_hp + player_mp + 5
+ var/score = player_hp + player_mp + 5
prizevend(score)
else if (emagged && (turtle >= 4))
var/boomamt = rand(5,10)
- src.temp = "[src.enemy_name] throws a bomb, exploding you for [boomamt] damage!"
+ temp = "[enemy_name] throws a bomb, exploding you for [boomamt] damage!"
playsound(src.loc, 'sound/arcade/Boom.ogg', 20, 1, extrarange = -6, falloff = 10)
- src.player_hp -= boomamt
+ player_hp -= boomamt
- else if ((src.enemy_mp <= 5) && (prob(70)))
+ else if ((enemy_mp <= 5) && (prob(70)))
var/stealamt = rand(2,3)
- src.temp = "[src.enemy_name] steals [stealamt] of your power!"
+ temp = "[enemy_name] steals [stealamt] of your power!"
playsound(src.loc, 'sound/arcade/Steal.ogg', 20, 1, extrarange = -6, falloff = 10)
- src.player_mp -= stealamt
- src.updateUsrDialog()
+ player_mp -= stealamt
+ updateUsrDialog()
- if (src.player_mp <= 0)
- src.gameover = 1
+ if (player_mp <= 0)
+ gameover = 1
sleep(10)
- src.temp = "You have been drained! GAME OVER"
+ temp = "You have been drained! GAME OVER"
playsound(src.loc, 'sound/arcade/Lose.ogg', 20, 1, extrarange = -6, falloff = 10)
if(emagged)
feedback_inc("arcade_loss_mana_emagged")
@@ -217,21 +217,21 @@
else
feedback_inc("arcade_loss_mana_normal")
- else if ((src.enemy_hp <= 10) && (src.enemy_mp > 4))
- src.temp = "[src.enemy_name] heals for 4 health!"
+ else if ((enemy_hp <= 10) && (enemy_mp > 4))
+ temp = "[enemy_name] heals for 4 health!"
playsound(src.loc, 'sound/arcade/Heal.ogg', 20, 1, extrarange = -6, falloff = 10)
- src.enemy_hp += 4
- src.enemy_mp -= 4
+ enemy_hp += 4
+ enemy_mp -= 4
else
var/attackamt = rand(3,6)
- src.temp = "[src.enemy_name] attacks for [attackamt] damage!"
+ temp = "[enemy_name] attacks for [attackamt] damage!"
playsound(src.loc, 'sound/arcade/Hit.ogg', 20, 1, extrarange = -6, falloff = 10)
- src.player_hp -= attackamt
+ player_hp -= attackamt
- if ((src.player_mp <= 0) || (src.player_hp <= 0))
- src.gameover = 1
- src.temp = "You have been crushed! GAME OVER"
+ if ((player_mp <= 0) || (player_hp <= 0))
+ gameover = 1
+ temp = "You have been crushed! GAME OVER"
playsound(src.loc, 'sound/arcade/Lose.ogg', 20, 1, extrarange = -6, falloff = 10)
if(emagged)
feedback_inc("arcade_loss_hp_emagged")
@@ -239,7 +239,7 @@
else
feedback_inc("arcade_loss_hp_normal")
- src.blocked = 0
+ blocked = 0
return
@@ -258,7 +258,7 @@
enemy_name = "Cuban Pete"
name = "Outbomb Cuban Pete"
- src.updateUsrDialog()
+ updateUsrDialog()
// *** THE ORION TRAIL ** //
@@ -410,7 +410,7 @@
dat += "Close
"
var/datum/browser/popup = new(user, "arcade", "The Orion Trail",400,700)
popup.set_content(dat)
- popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
+ popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
popup.open()
return
@@ -497,7 +497,7 @@
playsound(src.loc, 'sound/effects/bang.ogg', 20, 1)
if(ORION_TRAIL_MALFUNCTION)
playsound(src.loc, 'sound/effects/EMPulse.ogg', 20, 1)
- src.visible_message("[src] malfunctions, randomizing in-game stats!")
+ visible_message("[src] malfunctions, randomizing in-game stats!")
var/oldfood = food
var/oldfuel = fuel
food = rand(10,80) / rand(1,2)
@@ -505,9 +505,9 @@
if(electronics)
sleep(10)
if(oldfuel > fuel && oldfood > food)
- src.audible_message("[src] lets out a somehow reassuring chime.")
+ audible_message("[src] lets out a somehow reassuring chime.")
else if(oldfuel < fuel || oldfood < food)
- src.audible_message("[src] lets out a somehow ominous chime.")
+ audible_message("[src] lets out a somehow ominous chime.")
food = oldfood
fuel = oldfuel
playsound(src.loc, 'sound/machines/chime.ogg', 20, 1)
@@ -669,8 +669,8 @@
last_spaceport_action = "Traded Food for Fuel"
event()
- src.add_fingerprint(usr)
- src.updateUsrDialog()
+ add_fingerprint(usr)
+ updateUsrDialog()
busy = 0
return
@@ -944,7 +944,7 @@
turns = 1
atom_say("Congratulations, you made it to Orion!")
if(emagged)
- new /obj/item/weapon/orion_ship(src.loc)
+ new /obj/item/weapon/orion_ship(get_turf(src))
message_admins("[key_name_admin(usr)] made it to Orion on an emagged machine and got an explosive toy ship.")
log_game("[key_name(usr)] made it to Orion on an emagged machine and got an explosive toy ship.")
else
@@ -1008,17 +1008,17 @@
user << "You flip the switch on the underside of [src]."
active = 1
- src.visible_message("[src] softly beeps and whirs to life!")
+ visible_message("[src] softly beeps and whirs to life!")
playsound(src.loc, 'sound/machines/defib_SaftyOn.ogg', 25, 1)
atom_say("This is ship ID #[rand(1,1000)] to Orion Port Authority. We're coming in for landing, over.")
sleep(20)
- src.visible_message("[src] begins to vibrate...")
+ visible_message("[src] begins to vibrate...")
atom_say("Uh, Port? Having some issues with our reactor, could you check it out? Over.")
sleep(30)
atom_say("Oh, God! Code Eight! CODE EIGHT! IT'S GONNA BL-")
playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 25, 1)
sleep(3.6)
- src.visible_message("[src] explodes!")
+ visible_message("[src] explodes!")
explosion(src.loc, 1,2,4, flame_range = 3)
qdel(src)
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index e6626477d8f..45d15625e06 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -51,9 +51,9 @@
if(!proximity) return
if (istype(A, /obj/structure/reagent_dispensers/watertank) && get_dist(src,A) <= 1)
A.reagents.trans_to(src, 10)
- user << "\blue You fill the balloon with the contents of [A]."
- src.desc = "A translucent balloon with some form of liquid sloshing around in it."
- src.update_icon()
+ user << "You fill the balloon with the contents of [A]."
+ desc = "A translucent balloon with some form of liquid sloshing around in it."
+ update_icon()
return
/obj/item/toy/balloon/attackby(obj/O as obj, mob/user as mob, params)
@@ -67,19 +67,19 @@
O.reagents.reaction(user)
qdel(src)
else
- src.desc = "A translucent balloon with some form of liquid sloshing around in it."
- user << "\blue You fill the balloon with the contents of [O]."
+ desc = "A translucent balloon with some form of liquid sloshing around in it."
+ user << "You fill the balloon with the contents of [O]."
O.reagents.trans_to(src, 10)
- src.update_icon()
+ update_icon()
return
/obj/item/toy/balloon/throw_impact(atom/hit_atom)
- if(src.reagents.total_volume >= 1)
- src.visible_message("\red The [src] bursts!","You hear a pop and a splash.")
- src.reagents.reaction(get_turf(hit_atom))
+ if(reagents.total_volume >= 1)
+ visible_message("The [src] bursts!","You hear a pop and a splash.")
+ reagents.reaction(get_turf(hit_atom))
for(var/atom/A in get_turf(hit_atom))
- src.reagents.reaction(A)
- src.icon_state = "burst"
+ reagents.reaction(A)
+ icon_state = "burst"
spawn(5)
if(src)
qdel(src)
@@ -144,7 +144,7 @@
/obj/item/toy/crossbow/examine(mob/user)
..(user)
if (bullets)
- user << "\blue It is loaded with [bullets] foam darts!"
+ user << "It is loaded with [bullets] foam darts!"
/obj/item/toy/crossbow/attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I, /obj/item/toy/ammo/crossbow))
@@ -152,9 +152,9 @@
user.drop_item()
qdel(I)
bullets++
- user << "\blue You load the foam dart into the crossbow."
+ user << "You load the foam dart into the crossbow."
else
- usr << "\red It's already fully loaded."
+ usr << "It's already fully loaded."
/obj/item/toy/crossbow/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag)
@@ -205,23 +205,18 @@
/obj/item/toy/crossbow/attack(mob/M as mob, mob/user as mob)
- src.add_fingerprint(user)
+ add_fingerprint(user)
// ******* Check
- if (src.bullets > 0 && M.lying)
-
- for(var/mob/O in viewers(M, null))
- if(O.client)
- O.show_message(text("[] casually lines up a shot with []'s head and pulls the trigger!", user, M), 1, "You hear the sound of foam against skull.", 2)
- O.show_message(text("\red [] was hit in the head by the foam dart!", M), 1)
-
+ if (bullets > 0 && M.lying)
+ visible_message("[user] casually lines up a shot with [M]'s head and pulls the trigger!", "You hear the sound of foam against skull.")
+ M.visible_message("[M] was hit in the head by the foam dart!")
playsound(user.loc, 'sound/items/syringeproj.ogg', 50, 1)
new /obj/item/toy/ammo/crossbow(M.loc)
- src.bullets--
- else if (M.lying && src.bullets == 0)
- for(var/mob/O in viewers(M, null))
- if (O.client) O.show_message(text("[] casually lines up a shot with []'s head, pulls the trigger, then realizes they are out of ammo and drops to the floor in search of some!", user, M), 1, "You hear someone fall.", 2)
+ bullets--
+ else if (M.lying && bullets == 0)
+ visible_message("[user] casually lines up a shot with [M]'s head, pulls the trigger, then realizes they are out of ammo and drops to the floor in search of some!", "You hear someone fall.")
user.Weaken(5)
return
@@ -280,25 +275,25 @@
attack_verb = list("attacked", "struck", "hit")
/obj/item/toy/sword/attack_self(mob/user as mob)
- src.active = !( src.active )
- if (src.active)
- user << "\blue You extend the plastic blade with a quick flick of your wrist."
+ active = !(active)
+ if (active)
+ user << "You extend the plastic blade with a quick flick of your wrist."
playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
- src.icon_state = "swordblue"
- src.item_state = "swordblue"
- src.w_class = 4
+ icon_state = "swordblue"
+ item_state = "swordblue"
+ w_class = 4
else
- user << "\blue You push the plastic blade back down into the handle."
+ user << "You push the plastic blade back down into the handle."
playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
- src.icon_state = "sword0"
- src.item_state = "sword0"
- src.w_class = 2
+ icon_state = "sword0"
+ item_state = "sword0"
+ w_class = 2
if(istype(user,/mob/living/carbon/human))
var/mob/living/carbon/human/H = user
H.update_inv_l_hand()
H.update_inv_r_hand()
- src.add_fingerprint(user)
+ add_fingerprint(user)
return
// Copied from /obj/item/weapon/melee/energy/sword/attackby
@@ -380,7 +375,7 @@
s.set_up(3, 1, src)
s.start()
new /obj/effect/decal/cleanable/ash(src.loc)
- src.visible_message("\red The [src.name] explodes!","\red You hear a bang!")
+ visible_message("The [name] explodes!","You hear a bang!")
playsound(src, 'sound/effects/snap.ogg', 50, 1)
qdel(src)
@@ -400,7 +395,7 @@
s.set_up(3, 1, src)
s.start()
new /obj/effect/decal/cleanable/ash(src.loc)
- src.visible_message("\red The [src.name] explodes!","\red You hear a snap!")
+ visible_message("The [src.name] explodes!","You hear a snap!")
playsound(src, 'sound/effects/snap.ogg', 50, 1)
qdel(src)
@@ -408,13 +403,13 @@
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!"
+ M << "You step on the snap pop!"
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
s.set_up(2, 0, src)
s.start()
new /obj/effect/decal/cleanable/ash(src.loc)
- src.visible_message("\red The [src.name] explodes!","\red You hear a snap!")
+ visible_message("The [name] explodes!","You hear a snap!")
playsound(src, 'sound/effects/snap.ogg', 50, 1)
qdel(src)
@@ -585,7 +580,7 @@ obj/item/toy/cards/deck/New()
obj/item/toy/cards/deck/attack_hand(mob/user as mob)
var/choice = null
if(cards.len == 0)
- src.icon_state = "deck_[deckstyle]_empty"
+ icon_state = "deck_[deckstyle]_empty"
user << "There are no more cards to draw."
return
var/obj/item/toy/cards/singlecard/H = new/obj/item/toy/cards/singlecard(user.loc)
@@ -594,16 +589,16 @@ obj/item/toy/cards/deck/attack_hand(mob/user as mob)
H.parentdeck = src
var/O = src
H.apply_card_vars(H,O)
- src.cards -= choice
+ cards -= choice
H.pickup(user)
user.put_in_active_hand(H)
- src.visible_message("[user] draws a card from the deck.", "You draw a card from the deck.")
+ visible_message("[user] draws a card from the deck.", "You draw a card from the deck.")
if(cards.len > 26)
- src.icon_state = "deck_[deckstyle]_full"
+ icon_state = "deck_[deckstyle]_full"
else if(cards.len > 10)
- src.icon_state = "deck_[deckstyle]_half"
+ icon_state = "deck_[deckstyle]_half"
else if(cards.len > 1)
- src.icon_state = "deck_[deckstyle]_low"
+ icon_state = "deck_[deckstyle]_low"
obj/item/toy/cards/deck/attack_self(mob/user as mob)
if(cooldown < world.time - 50)
@@ -619,17 +614,17 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/use
if(!user.unEquip(C))
user << "The card is stuck to your hand, you can't add it to the deck!"
return
- src.cards += C.cardname
+ cards += C.cardname
user.visible_message("[user] adds a card to the bottom of the deck.","You add the card to the bottom of the deck.")
qdel(C)
else
user << "You can't mix cards from other decks."
if(cards.len > 26)
- src.icon_state = "deck_[deckstyle]_full"
+ icon_state = "deck_[deckstyle]_full"
else if(cards.len > 10)
- src.icon_state = "deck_[deckstyle]_half"
+ icon_state = "deck_[deckstyle]_half"
else if(cards.len > 1)
- src.icon_state = "deck_[deckstyle]_low"
+ icon_state = "deck_[deckstyle]_low"
obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user, params)
@@ -639,17 +634,17 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user,
if(!user.unEquip(C))
user << "The hand of cards is stuck to your hand, you can't add it to the deck!"
return
- src.cards += C.currenthand
+ cards += C.currenthand
user.visible_message("[user] puts their hand of cards in the deck.", "You put the hand of cards in the deck.")
qdel(C)
else
user << "You can't mix cards from other decks."
if(cards.len > 26)
- src.icon_state = "deck_[deckstyle]_full"
+ icon_state = "deck_[deckstyle]_full"
else if(cards.len > 10)
- src.icon_state = "deck_[deckstyle]_half"
+ icon_state = "deck_[deckstyle]_half"
else if(cards.len > 1)
- src.icon_state = "deck_[deckstyle]_low"
+ icon_state = "deck_[deckstyle]_low"
obj/item/toy/cards/deck/MouseDrop(atom/over_object)
var/mob/M = usr
@@ -712,7 +707,7 @@ obj/item/toy/cards/cardhand/Topic(href, href_list)
if (cardUser.get_item_by_slot(slot_l_hand) == src || cardUser.get_item_by_slot(slot_r_hand) == src)
var/choice = href_list["pick"]
var/obj/item/toy/cards/singlecard/C = new/obj/item/toy/cards/singlecard(cardUser.loc)
- src.currenthand -= choice
+ currenthand -= choice
C.parentdeck = src.parentdeck
C.cardname = choice
C.apply_card_vars(C,O)
@@ -721,13 +716,13 @@ obj/item/toy/cards/cardhand/Topic(href, href_list)
cardUser.visible_message("[cardUser] draws a card from \his hand.", "You take the [C.cardname] from your hand.")
interact(cardUser)
- if(src.currenthand.len < 3)
- src.icon_state = "[deckstyle]_hand2"
+ if(currenthand.len < 3)
+ icon_state = "[deckstyle]_hand2"
else if(src.currenthand.len < 4)
- src.icon_state = "[deckstyle]_hand3"
+ icon_state = "[deckstyle]_hand3"
else if(src.currenthand.len < 5)
- src.icon_state = "[deckstyle]_hand4"
- if(src.currenthand.len == 1)
+ icon_state = "[deckstyle]_hand4"
+ if(currenthand.len == 1)
var/obj/item/toy/cards/singlecard/N = new/obj/item/toy/cards/singlecard(src.loc)
N.parentdeck = src.parentdeck
N.cardname = src.currenthand[1]
@@ -742,17 +737,17 @@ obj/item/toy/cards/cardhand/Topic(href, href_list)
obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params)
if(istype(C))
- if(C.parentdeck == src.parentdeck)
- src.currenthand += C.cardname
+ if(C.parentdeck == parentdeck)
+ currenthand += C.cardname
user.unEquip(C)
user.visible_message("[user] adds a card to their hand.", "You add the [C.cardname] to your hand.")
interact(user)
if(currenthand.len > 4)
- src.icon_state = "[deckstyle]_hand5"
+ icon_state = "[deckstyle]_hand5"
else if(currenthand.len > 3)
- src.icon_state = "[deckstyle]_hand4"
+ icon_state = "[deckstyle]_hand4"
else if(currenthand.len > 2)
- src.icon_state = "[deckstyle]_hand3"
+ icon_state = "[deckstyle]_hand3"
qdel(C)
else
user << "You can't mix cards from other decks."
@@ -797,33 +792,33 @@ obj/item/toy/cards/singlecard/verb/Flip()
if(usr.stat || !ishuman(usr) || !usr.canmove || usr.restrained())
return
if(!flipped)
- src.flipped = 1
+ flipped = 1
if (cardname)
- src.icon_state = "sc_[cardname]_[deckstyle]"
- src.name = src.cardname
+ icon_state = "sc_[cardname]_[deckstyle]"
+ name = cardname
else
- src.icon_state = "sc_Ace of Spades_[deckstyle]"
- src.name = "What Card"
- src.pixel_x = 5
+ icon_state = "sc_Ace of Spades_[deckstyle]"
+ name = "What Card"
+ pixel_x = 5
else if(flipped)
- src.flipped = 0
- src.icon_state = "singlecard_down_[deckstyle]"
- src.name = "card"
- src.pixel_x = -5
+ flipped = 0
+ icon_state = "singlecard_down_[deckstyle]"
+ name = "card"
+ pixel_x = -5
obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params)
if(istype(I, /obj/item/toy/cards/singlecard/))
var/obj/item/toy/cards/singlecard/C = I
- if(C.parentdeck == src.parentdeck)
+ if(C.parentdeck == parentdeck)
var/obj/item/toy/cards/cardhand/H = new/obj/item/toy/cards/cardhand(user.loc)
H.currenthand += C.cardname
- H.currenthand += src.cardname
+ H.currenthand += cardname
H.parentdeck = C.parentdeck
H.apply_card_vars(H,C)
user.unEquip(C)
H.pickup(user)
user.put_in_active_hand(H)
- user << "You combine the [C.cardname] and the [src.cardname] into a hand."
+ user << "You combine the [C.cardname] and the [cardname] into a hand."
qdel(C)
qdel(src)
else
@@ -933,7 +928,7 @@ obj/item/toy/cards/deck/syndicate/black
/obj/item/toy/therapy/attack_self(mob/user)
if(cooldown < world.time - 8)
- user << "You relieve some stress with /the [src]."
+ user << "You relieve some stress with \the [src]."
playsound(user, 'sound/items/squeaktoy.ogg', 20, 1)
cooldown = world.time
@@ -1262,7 +1257,7 @@ obj/item/toy/cards/deck/syndicate/black
var/message = generate_ion_law()
user << "You press the button on [src]."
playsound(user, 'sound/machines/click.ogg', 20, 1)
- src.loc.visible_message("\icon[src] [message]")
+ visible_message("\icon[src] [message]")
cooldown = 1
spawn(30) cooldown = 0
return
@@ -1281,7 +1276,7 @@ obj/item/toy/cards/deck/syndicate/black
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/misc/hoot.ogg', 25, 1)
- src.loc.visible_message("\icon[src] [message]")
+ visible_message("\icon[src] [message]")
cooldown = 1
spawn(30) cooldown = 0
return
@@ -1300,7 +1295,7 @@ obj/item/toy/cards/deck/syndicate/black
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/misc/caw.ogg', 25, 1)
- src.loc.visible_message("\icon[src] [message]")
+ visible_message("\icon[src] [message]")
cooldown = 1
spawn(30) cooldown = 0
return
@@ -1532,13 +1527,6 @@ obj/item/toy/cards/deck/syndicate/black
else
icon_state = "chainsaw0"
-/obj/item/weapon/twohanded/toy/chainsaw/attack(mob/target as mob, mob/living/user as mob)
- if(wielded)
- playsound(loc, 'sound/weapons/chainsaw.ogg', 100, 1, -1)
- else
- playsound(loc, "swing_hit", 50, 1, -1)
- ..()
-
/*
* Action Figures
*/
diff --git a/code/modules/arcade/prize_counter.dm b/code/modules/arcade/prize_counter.dm
index 4190e50e6d3..5f1c8024553 100644
--- a/code/modules/arcade/prize_counter.dm
+++ b/code/modules/arcade/prize_counter.dm
@@ -176,7 +176,7 @@ td.cost.toomuch {
if(..())
return 1
- src.add_fingerprint(usr)
+ add_fingerprint(usr)
if(href_list["eject"])
print_tickets()
@@ -200,9 +200,9 @@ td.cost.toomuch {
if(!tickets)
return
if(tickets >= 9999)
- new /obj/item/stack/tickets(src.loc, 9999) //max stack size
+ new /obj/item/stack/tickets(get_turf(src), 9999) //max stack size
tickets -= 9999
print_tickets()
else
- new /obj/item/stack/tickets(src.loc, tickets)
+ new /obj/item/stack/tickets(get_turf(src), tickets)
tickets = 0
\ No newline at end of file