Merge pull request #183 from wraith-54321/no-free-pulse

Fixes an oversight in the barcade as well as a minor mapping error in the abductor bar
Monkestation · Sep 13, 2023 · 48cb4de · 48cb4de
2 parents a8a6a23 + 0efb30b
commit 48cb4de
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 8 deletions.
diff --git a/code/game/machinery/computer/arcade/arcade.dm b/code/game/machinery/computer/arcade/arcade.dm
@@ -652,6 +652,8 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
 	desc = "A picture of a blood-soaked medical cyborg flashes on the screen. The mediborg has a speech bubble that says, \"Put your hand in the machine if you aren't a <b>coward!</b>\""
 	icon_state = "arcade"
 	circuit = /obj/item/circuitboard/computer/arcade/amputation
+	/// does this machine work with slime people and oozlings
+	var/works_with_slimes = TRUE
 
 /obj/machinery/computer/arcade/amputation/attack_tk(mob/user)
 	return //that's a pretty damn big guillotine
@@ -670,9 +672,16 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
 		qdel(chopchop)
 		user.mind?.adjust_experience(/datum/skill/gaming, 100)
 		user.won_game()
-		playsound(src, 'sound/arcade/win.ogg', 50, TRUE)
-		new /obj/item/stack/arcadeticket((get_turf(src)), rand(6,10))
-		to_chat(user, span_notice("[src] dispenses a handful of tickets!"))
+//monkestation edit start
+		if((isoozeling(user) || isslimeperson(user)) && !(works_with_slimes))
+			playsound(src, 'sound/machines/destructive_scanner/ScanDangerous.ogg', 50, TRUE)
+			new /obj/effect/spawner/random/food_or_drink/soup(get_turf(src))
+			to_chat(user, span_warning("Your arm breaks \the [src]! Making it dispense a weird soup..."))
+//monkestation edit end, the else below this is also an edit
+		else
+			playsound(src, 'sound/arcade/win.ogg', 50, TRUE)
+			new /obj/item/stack/arcadeticket((get_turf(src)), rand(6,10))
+			to_chat(user, span_notice("[src] dispenses a handful of tickets!"))
 		return
 	else if(!do_they_still_have_that_hand(user, chopchop))
 		to_chat(user, span_warning("The guillotine drops, but your hand seems to be gone already!"))

diff --git a/monkestation/_maps/RandomBars/Icebox/icebox_bar_abductor.dmm b/monkestation/_maps/RandomBars/Icebox/icebox_bar_abductor.dmm
@@ -104,7 +104,7 @@
 /area/station/service/bar/backroom)
 "hj" = (
 /obj/machinery/firealarm/directional/south,
-/obj/machinery/computer/arcade{
+/obj/effect/spawner/random/entertainment/arcade{
 	dir = 8
 	},
 /turf/open/floor/mineral/fake_abductor,

diff --git a/monkestation/_maps/RandomBars/Icebox/icebox_bar_arcade.dmm b/monkestation/_maps/RandomBars/Icebox/icebox_bar_arcade.dmm
@@ -133,7 +133,7 @@
 "gc" = (
 /obj/machinery/airalarm/directional/north,
 /obj/machinery/firealarm/directional/west,
-/obj/machinery/computer/arcade/amputation,
+/obj/machinery/computer/arcade/amputation/bar,
 /turf/open/floor/circuit/green,
 /area/station/service/theater)
 "gS" = (

diff --git a/monkestation/code/modules/mob/living/basic/animatronic.dm b/monkestation/code/modules/mob/living/basic/animatronic.dm
@@ -101,7 +101,6 @@
 	. = ..()
 	if(!blood_hunger)
 		icon_state = "monkey_animatronic_2"
-		desc += " It's glaring at you."
 		become_blood_hungry()
 
 /mob/living/basic/monkey_animatronic/attack_hand(mob/living/carbon/human/user, list/modifiers)
@@ -128,6 +127,9 @@
 	if(isobserver(user))
 		. += "It has killed [killed_list.len] so far."
 
+	if(blood_hunger)
+		. += "It's glaring at you."
+
 /mob/living/basic/monkey_animatronic/melee_attack(atom/target, list/modifiers)
 	. = ..()
 	var/mob/living/living_target = target

diff --git a/monkestation/code/modules/random_rooms/bars/icebox_bar_modules.dm b/monkestation/code/modules/random_rooms/bars/icebox_bar_modules.dm
@@ -109,3 +109,14 @@
 	desc = "Used for, something. You're not sure what."
 	icon = 'icons/obj/abductor.dmi'
 	icon_state = "console"
+
+///////////////
+//ARCAEDE BAR//
+///////////////
+
+/obj/machinery/computer/arcade/amputation/bar
+	circuit = /obj/item/circuitboard/computer/arcade/amputation/bar
+	works_with_slimes = FALSE
+
+/obj/item/circuitboard/computer/arcade/amputation/bar
+	build_path = /obj/machinery/computer/arcade/amputation/bar
diff --git a/monkestation/code/random_rooms/bars/icebox.dm b/monkestation/code/random_rooms/bars/icebox.dm
@@ -10,13 +10,13 @@
 	station_name = "Ice Box Station"
 
 
-/datum/map_template/random_room/random_bar/icebox_abductor
+/datum/map_template/random_room/random_bar/icebox_base/abductor
 	name = "Abductor Icebox Bar"
 	room_id = "icebox_bar_abductor"
 	mappath = "monkestation/_maps/RandomBars/Icebox/icebox_bar_abductor.dmm"
 	weight = 16
 
-/datum/map_template/random_room/random_bar/icebox_arcade
+/datum/map_template/random_room/random_bar/icebox_base/arcade
 	name = "Arcade Icebox Bar"
 	room_id = "icebox_bar_arcade"
 	mappath = "monkestation/_maps/RandomBars/Icebox/icebox_bar_arcade.dmm"
@@ -26,6 +26,7 @@
 	name = "Magbar"
 	room_id = "Magbar"
 	mappath = "monkestation/_maps/RandomBars/Icebox/Magbar.dmm"
+	weight = 10
 
 /datum/map_template/random_room/random_bar/icebox_base/green_bar_disco
 	name = "green_bar_disco"