cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 22:42:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Arcade Machine Powercreep (#4070)

Browse Source 
Adds various items to the arcade Machine
This commit is contained in:
BurgerLUA
2018-01-14 18:58:55 +01:00
committed by Werner
parent 12788617d2
commit 6e2b95395e
3 changed files with 52 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/arcade.dm
+32 -16
View File
@@ -4,15 +4,14 @@
icon_state = "arcade"
icon_screen = "invaders"
var/list/prizes = list( /obj/item/weapon/storage/box/snappops = 2,
/obj/item/toy/blink = 2,
/obj/item/clothing/under/syndicate/tacticool = 2,
/obj/item/toy/sword = 2,
/obj/item/weapon/gun/projectile/revolver/capgun = 2,
/obj/item/toy/crossbow = 2,
/obj/item/clothing/suit/syndicatefake = 2,
/obj/item/weapon/storage/fancy/crayons = 2,
/obj/item/toy/spinningtoy = 2,
var/list/prizes = list( /obj/item/weapon/storage/box/snappops = 11,
/obj/item/clothing/under/syndicate/tacticool = 11,
/obj/item/toy/sword = 22,
/obj/item/weapon/gun/projectile/revolver/capgun = 11,
/obj/item/toy/crossbow = 11,
/obj/item/clothing/suit/syndicatefake = 11,
/obj/item/weapon/storage/fancy/crayons = 11,
/obj/item/toy/spinningtoy = 22,
/obj/item/toy/prize/ripley = 1,
/obj/item/toy/prize/fireripley = 1,
/obj/item/toy/prize/deathripley = 1,
@@ -24,11 +23,28 @@
/obj/item/toy/prize/mauler = 1,
/obj/item/toy/prize/odysseus = 1,
/obj/item/toy/prize/phazon = 1,
/obj/item/toy/waterflower = 1,
/obj/random/action_figure = 1,
/obj/random/plushie = 1,
/obj/item/toy/cultsword = 1
)
/obj/item/toy/waterflower = 11,
/obj/random/action_figure = 11,
/obj/random/plushie = 55,
/obj/item/toy/cultsword = 11,
/obj/item/toy/syndicateballoon = 11,
/obj/item/toy/nanotrasenballoon = 11,
/obj/item/toy/katana = 11,
/obj/item/toy/bosunwhistle = 11,
/obj/item/weapon/storage/belt/champion = 11,
/obj/item/weapon/pen/invisible = 11,
/obj/item/weapon/grenade/fake = 1,
/obj/item/weapon/bikehorn = 11,
/obj/item/weapon/lipstick/random = 11,
/obj/item/clothing/mask/fakemoustache = 11,
/obj/item/clothing/mask/gas/clown_hat = 11,
/obj/item/clothing/mask/gas/mime = 11,
/obj/item/weapon/gun/energy/wand/toy = 11,
/obj/item/device/binoculars = 11,
/obj/item/device/megaphone = 11,
/obj/random/booze = 22,
/obj/item/weapon/banhammer = 1
)
/obj/machinery/computer/arcade/Initialize()
. = ..()
@@ -39,7 +55,7 @@
var/obj/item/weapon/circuitboard/CB = new choice()
new CB.build_path(loc, CB)
return INITIALIZE_HINT_QDEL
return INITIALIZE_HINT_QDEL
/obj/machinery/computer/arcade/proc/prizevend()
if(!contents.len)
@@ -278,4 +294,4 @@
name = "Outbomb Cuban Pete"
src.updateUsrDialog()
return 1
return 1
code/game/objects/items/toys.dm
+11 -19
View File
@@ -255,21 +255,21 @@
*/
/obj/item/toy/sword
name = "toy sword"
desc = "A cheap, plastic replica of an energy sword. Realistic sounds! Ages 8 and up."
desc = "A cheap, plastic replica of a blue energy sword. Realistic sounds and colors! Ages 8 and up."
icon = 'icons/obj/weapons.dmi'
icon_state = "sword0"
item_state = "sword0"
var/active = 0.0
var/colorvar = "blue"
w_class = 2.0
attack_verb = list("attacked", "struck", "hit")
attack_self(mob/user as mob)
src.active = !( src.active )
if (src.active)
user << "<span class='notice'>You extend the plastic blade with a quick flick of your wrist.</span>"
playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
src.icon_state = "swordblue"
src.item_state = "swordblue"
src.icon_state = "sword[colorvar]"
src.item_state = "sword[colorvar]"
src.w_class = 4
else
user << "<span class='notice'>You push the plastic blade back down into the handle.</span>"
@@ -286,9 +286,14 @@
src.add_fingerprint(user)
return
/obj/item/toy/sword/Initialize()
. = ..()
colorvar = pick("red","blue","green","purple")
desc = "A cheap, plastic replica of a [colorvar] energy sword. Realistic sounds and colors! Ages 8 and up."
/obj/item/toy/katana
name = "replica katana"
desc = "Woefully underpowered in D20."
desc = "A cheap plastic katana that luckily isn't sharp enough to accidentally cut your floor length braid. Woefully underpowered in D20."
icon = 'icons/obj/weapons.dmi'
icon_state = "katana"
item_state = "katana"
@@ -694,19 +699,6 @@
desc = "A \"Space Life\" brand Emergency Response Team Commander action figure."
icon_state = "ert"
/obj/item/toy/katana
name = "replica katana"
desc = "Woefully underpowered in D20."
icon = 'icons/obj/weapons.dmi'
icon_state = "katana"
item_state = "katana"
flags = CONDUCT
slot_flags = SLOT_BELT | SLOT_BACK
force = 5
throwforce = 5
w_class = 3
attack_verb = list("attacked", "slashed", "stabbed", "sliced")
/obj/item/toy/therapy_red
name = "red therapy doll"
desc = "A toy for therapeutic and recreational purposes. This one is red."
@@ -860,7 +852,7 @@
//Toy cult sword
/obj/item/toy/cultsword
name = "foam sword"
desc = "An arcane weapon (made of foam) wielded by the followers of the hit Saturday morning cartoon \"King Nursee and the Acolytes of Heroism\"."
desc = "An arcane weapon wielded by the followers of the hit Saturday morning cartoon \"King Nursee and the Acolytes of Heroism\"."
icon = 'icons/obj/weapons.dmi'
icon_state = "cultblade"
item_state = "cultblade"
html/changelogs/burgerbb-arcadepowercreep.yml
+9
View File
@@ -0,0 +1,9 @@
author: BurgerBB
delete-after: True
changes:
- tweak: "Added syndicate balloons, nanotrasen balloons, replica katanas, bosun whistles, champion belts, invisible pens, bikehorns, lipstick, fake moustashes, clown masks, mime masks, fake wands, binoculars, megaphones, random booze, and the banhammer to the arcade loot tables."
- tweak: "Toy mechs are significatnly rarer."
- tweak: "Toy swords now spawn with random colors (red,blue,purple,green) as opposed to just the static blue."
- rscdel: "Removed duplicate katana code that seemingly exists for no real reason."