diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 0a1f45d800a..f2f3cb9294c 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -178,10 +178,6 @@ log_game("[key_name_admin(usr)] has outbombed Cuban Pete and been awarded a bomb.",ckey=key_name(usr)) src.New() emagged = 0 - else if(!contents.len) - feedback_inc("arcade_win_normal") - src.prizevend() - else feedback_inc("arcade_win_normal") src.prizevend() diff --git a/code/game/machinery/computer/arcade_orion.dm b/code/game/machinery/computer/arcade_orion.dm index 32fce06c7ee..48163ac944c 100644 --- a/code/game/machinery/computer/arcade_orion.dm +++ b/code/game/machinery/computer/arcade_orion.dm @@ -67,6 +67,7 @@ var/distance = 0 var/port = 0 var/view = 0 + prize = /obj/random/arcade/orion /obj/machinery/computer/arcade/orion_trail/proc/newgame(var/emag = 0) name = "orion trail[emag ? ": Realism Edition" : ""]" diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 3e92ff3ff85..75fecb7ee8a 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -996,6 +996,33 @@ /obj/item/weapon/spirit_board = 5 ) +/obj/random/arcade/orion + name = "random arcade loot for orion trails" + desc = "Arcade loot for orion trails aracde machine!" + icon = 'icons/obj/items.dmi' + icon_state = "gift3" + spawnlist = list( + /obj/item/clothing/under/syndicate/tacticool = 7, + /obj/item/toy/sword = 22, + /obj/item/weapon/gun/projectile/revolver/capgun = 11, + /obj/item/weapon/gun/bang = 22, + /obj/item/toy/crossbow = 11, + /obj/random/action_figure = 11, + /obj/item/toy/cultsword = 7, + /obj/item/toy/syndicateballoon = 10, + /obj/item/toy/nanotrasenballoon = 5, + /obj/item/toy/katana = 11, + /obj/item/weapon/storage/belt/champion = 11, + /obj/item/weapon/pen/invisible = 10, + /obj/item/weapon/grenade/fake = 7, + /obj/item/weapon/gun/energy/wand/toy = 7, + /obj/item/device/binoculars = 11, + /obj/item/device/megaphone = 11, + /obj/item/eightball = 11, + /obj/item/eightball/haunted = 5, + /obj/item/weapon/spirit_board = 5 + ) + /obj/random/custom_ka name = "random custom kinetic accelerator" desc = "Contains random assemblies. The parts may not always be compatible with eachother." diff --git a/html/changelogs/Sindorman-orion.yml b/html/changelogs/Sindorman-orion.yml new file mode 100644 index 00000000000..c85fd0608f3 --- /dev/null +++ b/html/changelogs/Sindorman-orion.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: PoZe + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Orion trails prizes have been tweaked. It now includes only cool stuff like syndicate fake items, fake weapons, eighballs. Flag gun was added to the list as well."