From 2ce4b4b3d8947711e5cd6a0b090cc3fc0befdd86 Mon Sep 17 00:00:00 2001 From: deathrobotpunch <87455177+deathrobotpunch@users.noreply.github.com> Date: Thu, 12 Sep 2024 10:56:27 +0800 Subject: [PATCH 01/15] mech toys --- code/game/machinery/computer/arcade.dm | 32 ++++++++++++++++++-------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 4f6f4df4ef08..3a2a70853f31 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -15,16 +15,30 @@ var/enemy_mp = 25 var/gameover = 0 var/blocked = 0 //Player cannot attack/heal while set - var/list/prizes = list( /obj/item/storage/box/MRE = 3, - /obj/item/spacecash/c10 = 4, - /obj/item/ammo_magazine/flamer_tank = 1, + var/list/prizes = list( + /obj/item/tool/lighter/zippo = 2, + /obj/item/facepaint/sniper = 2, + /obj/item/toy/gun = 2, + /obj/item/toy/crossbow = 2, + /obj/item/toy/sword = 2, + /obj/item/toy/katana = 2, + /obj/item/toy/spinningtoy = 2, + /obj/item/toy/prize/ripley = 2, + /obj/item/toy/prize/fireripley = 2, + /obj/item/toy/prize/deathripley = 2, + /obj/item/toy/prize/gygax = 2, + /obj/item/toy/prize/durand = 2, + /obj/item/toy/prize/honk = 2, + /obj/item/toy/prize/marauder = 2, + /obj/item/toy/prize/seraph = 2, + /obj/item/toy/prize/mauler = 2, + /obj/item/toy/prize/odysseus = 2, + /obj/item/tool/lighter/zippo = 2, + /obj/item/tool/lighter/zippo = 2, + /obj/item/tool/lighter/zippo = 2, + /obj/item/tool/lighter/zippo = 2, + /obj/item/tool/lighter/zippo = 2, /obj/item/tool/lighter/zippo = 2, - /obj/item/tool/weldingtool = 1, - /obj/item/storage/box/uscm_mre = 2, - /obj/item/device/camera = 2, - /obj/item/device/camera_film = 4, - /obj/item/cell/crap/empty = 3, - /obj/item/tool/hand_labeler = 1 ) /obj/structure/machinery/computer/arcade From a18ddc5511505cf950a59cf61c15bb631c77cdbe Mon Sep 17 00:00:00 2001 From: deathrobotpunch <87455177+deathrobotpunch@users.noreply.github.com> Date: Thu, 12 Sep 2024 11:47:35 +0800 Subject: [PATCH 02/15] the plushening --- code/game/machinery/computer/arcade.dm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 3a2a70853f31..928b652f6aad 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -33,12 +33,20 @@ /obj/item/toy/prize/seraph = 2, /obj/item/toy/prize/mauler = 2, /obj/item/toy/prize/odysseus = 2, - /obj/item/tool/lighter/zippo = 2, - /obj/item/tool/lighter/zippo = 2, - /obj/item/tool/lighter/zippo = 2, - /obj/item/tool/lighter/zippo = 2, - /obj/item/tool/lighter/zippo = 2, - /obj/item/tool/lighter/zippo = 2, + /obj/item/toy/bikehorn = 2, // honk + /obj/item/clothing/head/collectable/tophat/super = 2, + /obj/item/toy/plush/farwa = 2, + /obj/item/toy/plush/barricade = 2, + /obj/item/toy/plush/shark = 2, + /obj/item/toy/plush/bee = 2, + /obj/item/toy/plush/moth = 2 + /obj/item/toy/plush/rock =2 + /obj/item/tool/lighter/zippo + /obj/item/tool/lighter/zippo + /obj/item/tool/lighter/zippo + /obj/item/tool/lighter/zippo + /obj/item/tool/lighter/zippo + /obj/item/tool/lighter/zippo ) /obj/structure/machinery/computer/arcade From fa2dfc7b0395f0a62286daab2a9af712e912b04d Mon Sep 17 00:00:00 2001 From: deathrobotpunch <87455177+deathrobotpunch@users.noreply.github.com> Date: Thu, 12 Sep 2024 12:59:46 +0800 Subject: [PATCH 03/15] DONE! --- code/game/machinery/computer/arcade.dm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 928b652f6aad..774347af0722 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -16,12 +16,12 @@ var/gameover = 0 var/blocked = 0 //Player cannot attack/heal while set var/list/prizes = list( - /obj/item/tool/lighter/zippo = 2, - /obj/item/facepaint/sniper = 2, - /obj/item/toy/gun = 2, - /obj/item/toy/crossbow = 2, - /obj/item/toy/sword = 2, - /obj/item/toy/katana = 2, + /obj/item/tool/lighter/zippo = 10, + /obj/item/facepaint/sniper = 10, + /obj/item/toy/gun = 10, + /obj/item/toy/crossbow = 10, + /obj/item/toy/sword = 5, + /obj/item/toy/katana = 1, /obj/item/toy/spinningtoy = 2, /obj/item/toy/prize/ripley = 2, /obj/item/toy/prize/fireripley = 2, @@ -40,13 +40,11 @@ /obj/item/toy/plush/shark = 2, /obj/item/toy/plush/bee = 2, /obj/item/toy/plush/moth = 2 - /obj/item/toy/plush/rock =2 - /obj/item/tool/lighter/zippo - /obj/item/tool/lighter/zippo - /obj/item/tool/lighter/zippo - /obj/item/tool/lighter/zippo - /obj/item/tool/lighter/zippo - /obj/item/tool/lighter/zippo + /obj/item/toy/plush/rock = 5 + /obj/item/storage/box/snappops = 5 + /obj/item/clothing/mask/owlf_mask = 1 + /obj/item/facepaint/lipstick = 1 + /obj/item/facepaint/lipstick/jade = 1 ) /obj/structure/machinery/computer/arcade From 355db142edc4164c993c50a8fd6d2b634ad3af13 Mon Sep 17 00:00:00 2001 From: deathrobotpunch <87455177+deathrobotpunch@users.noreply.github.com> Date: Thu, 12 Sep 2024 13:10:46 +0800 Subject: [PATCH 04/15] fixes list --- code/game/machinery/computer/arcade.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 774347af0722..fcf69728ccb7 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -15,8 +15,7 @@ var/enemy_mp = 25 var/gameover = 0 var/blocked = 0 //Player cannot attack/heal while set - var/list/prizes = list( - /obj/item/tool/lighter/zippo = 10, + var/list/prizes = list( /obj/item/tool/lighter/zippo = 10, /obj/item/facepaint/sniper = 10, /obj/item/toy/gun = 10, /obj/item/toy/crossbow = 10, From f3ebcee52317577b02abd22563d8544ca06d5c91 Mon Sep 17 00:00:00 2001 From: deathrobotpunch <87455177+deathrobotpunch@users.noreply.github.com> Date: Thu, 12 Sep 2024 13:15:59 +0800 Subject: [PATCH 05/15] Update arcade.dm --- code/game/machinery/computer/arcade.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index fcf69728ccb7..4ebe98d80a68 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -46,7 +46,7 @@ /obj/item/facepaint/lipstick/jade = 1 ) -/obj/structure/machinery/computer/arcade +obj/structure/machinery/computer/arcade var/turtle = 0 /obj/structure/machinery/computer/arcade/attack_remote(mob/user as mob) From 1e3ee0b56c2ef1da0975d207fd40c96ff78187c2 Mon Sep 17 00:00:00 2001 From: deathrobotpunch <87455177+deathrobotpunch@users.noreply.github.com> Date: Thu, 12 Sep 2024 13:16:47 +0800 Subject: [PATCH 06/15] Update arcade.dm --- code/game/machinery/computer/arcade.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 4ebe98d80a68..3e762ab33692 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -38,11 +38,11 @@ /obj/item/toy/plush/barricade = 2, /obj/item/toy/plush/shark = 2, /obj/item/toy/plush/bee = 2, - /obj/item/toy/plush/moth = 2 - /obj/item/toy/plush/rock = 5 - /obj/item/storage/box/snappops = 5 - /obj/item/clothing/mask/owlf_mask = 1 - /obj/item/facepaint/lipstick = 1 + /obj/item/toy/plush/moth = 2, + /obj/item/toy/plush/rock = 5, + /obj/item/storage/box/snappops = 5, + /obj/item/clothing/mask/owlf_mask = 1, + /obj/item/facepaint/lipstick = 1, /obj/item/facepaint/lipstick/jade = 1 ) From 934e2ffa4ab3917a533053529b6969c92993c04b Mon Sep 17 00:00:00 2001 From: deathrobotpunch <87455177+deathrobotpunch@users.noreply.github.com> Date: Thu, 12 Sep 2024 13:20:30 +0800 Subject: [PATCH 07/15] committing suggestion Co-authored-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> --- code/game/machinery/computer/arcade.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 3e762ab33692..17f5a56c95d5 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -46,7 +46,7 @@ /obj/item/facepaint/lipstick/jade = 1 ) -obj/structure/machinery/computer/arcade +/obj/structure/machinery/computer/arcade var/turtle = 0 /obj/structure/machinery/computer/arcade/attack_remote(mob/user as mob) From 22331cfa0074686e0e6dfe4b196f32cef877e807 Mon Sep 17 00:00:00 2001 From: deathrobotpunch <87455177+deathrobotpunch@users.noreply.github.com> Date: Fri, 13 Sep 2024 08:25:55 +0800 Subject: [PATCH 08/15] removes OWLF mask --- code/game/machinery/computer/arcade.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 17f5a56c95d5..579fb3b9ddd2 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -41,9 +41,11 @@ /obj/item/toy/plush/moth = 2, /obj/item/toy/plush/rock = 5, /obj/item/storage/box/snappops = 5, - /obj/item/clothing/mask/owlf_mask = 1, /obj/item/facepaint/lipstick = 1, /obj/item/facepaint/lipstick/jade = 1 + /obj/item/clothing/head/headband/gray + /obj/item/clothing/head/headband/red + /obj/item/clothing/mask/tornscarf ) /obj/structure/machinery/computer/arcade From 96db362a93de8857abeaa3ac78718ef36ac7d2cd Mon Sep 17 00:00:00 2001 From: deathrobotpunch <87455177+deathrobotpunch@users.noreply.github.com> Date: Fri, 13 Sep 2024 08:27:12 +0800 Subject: [PATCH 09/15] Update arcade.dm --- code/game/machinery/computer/arcade.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 579fb3b9ddd2..0b35334f12eb 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -43,9 +43,9 @@ /obj/item/storage/box/snappops = 5, /obj/item/facepaint/lipstick = 1, /obj/item/facepaint/lipstick/jade = 1 - /obj/item/clothing/head/headband/gray - /obj/item/clothing/head/headband/red - /obj/item/clothing/mask/tornscarf + /obj/item/clothing/head/headband/gray = 5 + /obj/item/clothing/head/headband/red = 5 + /obj/item/clothing/mask/tornscarf = 5 ) /obj/structure/machinery/computer/arcade From 14ec368ac01ede66a532df5dd072579f2d5ffc36 Mon Sep 17 00:00:00 2001 From: deathrobotpunch <87455177+deathrobotpunch@users.noreply.github.com> Date: Fri, 13 Sep 2024 08:27:45 +0800 Subject: [PATCH 10/15] =?UTF-8?q?I=E2=80=99m=20dumb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/game/machinery/computer/arcade.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 0b35334f12eb..df11b570b9d1 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -42,9 +42,9 @@ /obj/item/toy/plush/rock = 5, /obj/item/storage/box/snappops = 5, /obj/item/facepaint/lipstick = 1, - /obj/item/facepaint/lipstick/jade = 1 - /obj/item/clothing/head/headband/gray = 5 - /obj/item/clothing/head/headband/red = 5 + /obj/item/facepaint/lipstick/jade = 1, + /obj/item/clothing/head/headband/gray = 5, + /obj/item/clothing/head/headband/red = 5, /obj/item/clothing/mask/tornscarf = 5 ) From ba81138f3d1bfd0da9248b13777f3255581398ee Mon Sep 17 00:00:00 2001 From: deathrobotpunch <87455177+deathrobotpunch@users.noreply.github.com> Date: Fri, 13 Sep 2024 08:35:26 +0800 Subject: [PATCH 11/15] adds stompy shoes --- code/game/machinery/computer/arcade.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index df11b570b9d1..bd1dca4b7d15 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -45,7 +45,9 @@ /obj/item/facepaint/lipstick/jade = 1, /obj/item/clothing/head/headband/gray = 5, /obj/item/clothing/head/headband/red = 5, - /obj/item/clothing/mask/tornscarf = 5 + /obj/item/clothing/mask/tornscarf = 5, + /obj/item/clothing/shoes/stompers = 1 + ) /obj/structure/machinery/computer/arcade From d626e09fb1e9cb6776cf32460962dc9ad2685273 Mon Sep 17 00:00:00 2001 From: deathrobotpunch <87455177+deathrobotpunch@users.noreply.github.com> Date: Thu, 19 Sep 2024 14:03:53 +0800 Subject: [PATCH 12/15] Update arcade.dm --- code/game/machinery/computer/arcade.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index bd1dca4b7d15..70a8e4a018c0 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -15,10 +15,11 @@ var/enemy_mp = 25 var/gameover = 0 var/blocked = 0 //Player cannot attack/heal while set - var/list/prizes = list( /obj/item/tool/lighter/zippo = 10, - /obj/item/facepaint/sniper = 10, - /obj/item/toy/gun = 10, - /obj/item/toy/crossbow = 10, + var/list/prizes = list( /obj/item/tool/lighter/zippo = 4, + obj/item/spacecash/ewallet = 4, worth = 25 + /obj/item/facepaint/sniper = 4, + /obj/item/toy/gun = 4, + /obj/item/toy/crossbow = 4, /obj/item/toy/sword = 5, /obj/item/toy/katana = 1, /obj/item/toy/spinningtoy = 2, From 2dc88d592df3c29ec44dfea685d6004b3e5056d4 Mon Sep 17 00:00:00 2001 From: deathrobotpunch <87455177+deathrobotpunch@users.noreply.github.com> Date: Thu, 19 Sep 2024 14:07:30 +0800 Subject: [PATCH 13/15] add / --- code/game/machinery/computer/arcade.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 70a8e4a018c0..7f362289ce30 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -16,7 +16,7 @@ var/gameover = 0 var/blocked = 0 //Player cannot attack/heal while set var/list/prizes = list( /obj/item/tool/lighter/zippo = 4, - obj/item/spacecash/ewallet = 4, worth = 25 + /obj/item/spacecash/ewallet = 4, worth = 25 /obj/item/facepaint/sniper = 4, /obj/item/toy/gun = 4, /obj/item/toy/crossbow = 4, From 28e8e988bf4f443aa3f65a063915893126ad26a5 Mon Sep 17 00:00:00 2001 From: deathrobotpunch <87455177+deathrobotpunch@users.noreply.github.com> Date: Thu, 19 Sep 2024 14:46:34 +0800 Subject: [PATCH 14/15] Update arcade.dm --- code/game/machinery/computer/arcade.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 7f362289ce30..6cb2494b3214 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -16,7 +16,7 @@ var/gameover = 0 var/blocked = 0 //Player cannot attack/heal while set var/list/prizes = list( /obj/item/tool/lighter/zippo = 4, - /obj/item/spacecash/ewallet = 4, worth = 25 + /obj/item/spacecash/ewallet = 4, worth = 25 /obj/item/facepaint/sniper = 4, /obj/item/toy/gun = 4, /obj/item/toy/crossbow = 4, From e6200e4c829853082ddb510184722c240c32f902 Mon Sep 17 00:00:00 2001 From: deathrobotpunch <87455177+deathrobotpunch@users.noreply.github.com> Date: Thu, 19 Sep 2024 19:42:17 +0800 Subject: [PATCH 15/15] Update arcade.dm --- code/game/machinery/computer/arcade.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 6cb2494b3214..8060597b9a2d 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -16,7 +16,6 @@ var/gameover = 0 var/blocked = 0 //Player cannot attack/heal while set var/list/prizes = list( /obj/item/tool/lighter/zippo = 4, - /obj/item/spacecash/ewallet = 4, worth = 25 /obj/item/facepaint/sniper = 4, /obj/item/toy/gun = 4, /obj/item/toy/crossbow = 4,