review & tweaks

maplestation.dme

@@ -6086,6 +6086,7 @@
 #include "maplestation_modules\code\__DEFINES\subsystems\_module_subsystem_priorities.dm"
 #include "maplestation_modules\code\__HELPERS\magic_helpers.dm"
 #include "maplestation_modules\code\__HELPERS\text_helpers.dm"
+#include "maplestation_modules\code\__HELPERS\_globalvars\lists.dm"
 #include "maplestation_modules\code\controllers\configuration\entries\autotransfer.dm"
 #include "maplestation_modules\code\controllers\subsystem\autotransfer.dm"
 #include "maplestation_modules\code\controllers\subsystem\economy.dm"

maplestation_modules/code/__HELPERS/_globalvars/lists.dm

@@ -0,0 +1,2 @@
+// Descriptions of slot machines
+GLOBAL_LIST_INIT(slot_type_descriptions, world.file2list("maplestation_modules/strings/slots.txt"))

maplestation_modules/code/modules/casino/areas.dm

@@ -20,15 +20,11 @@
 	name = "Casino Floor"
 	icon_state = "awaycontent3"
 	ambientsounds = list(
-		'sound/machines/coindrop.ogg',
-		'sound/machines/coindrop2.ogg',
-		'sound/machines/roulettejackpot.ogg',
-		'sound/machines/roulettewheel.ogg',
 		'maplestation_modules/sound/ambience/casino/CasinoAmbience1.ogg',
 		'maplestation_modules/sound/ambience/casino/CasinoAmbience2.ogg'
 	)
 
-/// Lowered volume
+/// Lowered volume, not actually sure if this works?
 /area/awaymission/casino/floor/play_ambience(M, override_sound, volume = 10)
 	return ..()
 
@@ -132,15 +128,16 @@
 	for(var/mob/living/enterer as anything in arrived.get_all_contents_type(/mob/living))
 		to_chat(enterer, span_userdanger("This was a bad idea..."))
 		enterer.become_blind(CASINO_MAZE)
-		enterer.apply_status_effect(/datum/status_effect/jitter)
-		enterer.apply_status_effect(/datum/status_effect/hallucination)
 		// It's a timed effect but we're going to remove it when they leave, so we make it really long.
-		curse_of_babel(enterer, 60 MINUTES)
+		enterer.apply_status_effect(/datum/status_effect/jitter, 60 MINUTES)
+		enterer.apply_status_effect(/datum/status_effect/hallucination, 60 MINUTES)
+		// Want to make them not able to get help through the maze but don't want them to become deaf
+		curse_of_babel(enterer)
 
 /area/awaymission/casino/floor/maze/Exited(atom/movable/gone, direction)
 	. = ..()
 	for(var/mob/living/exiter as anything in gone.get_all_contents_type(/mob/living))
-		to_chat(exiter, span_boldnicegreen("I feel so much better..."))
+		to_chat(exiter, span_boldnicegreen("I feel so much better!"))
 		exiter.cure_blind(CASINO_MAZE)
 		exiter.remove_status_effect(/datum/status_effect/jitter)
 		exiter.remove_status_effect(/datum/status_effect/hallucination)

maplestation_modules/code/modules/casino/machines.dm

@@ -1,10 +1,14 @@
-// Random slot names, 1 free spin per machine, and a random amount of max money from 500 to 1 million credits.
+/obj/machinery/computer/slot_machine
+	icon = 'maplestation_modules/icons/obj/machines/computer.dmi'
+
+
+// Random slot names, 1 free spin per machine, random extra description of what it looks like, and a random amount of max money from 500 to 1 million credits.
 /obj/machinery/computer/slot_machine/green
 	name = "AGENT GREEN'S MEAN MACHINE"
 	desc = "A sign on the side says \"ALL MACHINES START WITH 1 FREE SPIN!\""
 	balance = 5
 	/// Possible names that this machine can have.
-	var/list/possible_names = list(
+	var/static/list/possible_names = list(
 		"AGENT GREEN'S MEAN MACHINE",
 		"BOSS BUX",
 		"PAYCHECK QUEST",
@@ -21,34 +25,39 @@
 	)
 	/// Added descriptor of what the machine looks like.
 	var/this_slot_type = "It's a standard slot machine housing some mechanical reels with symbols on each one."
-	// I went way overboard with these to be honest
-	/// Because it threw errors if we don't put it to its own var
-	var/list/slot_type_list
 
 /obj/machinery/computer/slot_machine/green/Initialize(mapload)
 	. = ..()
 	name = pick(possible_names)
 	money = rand(500,1000000)
-	slot_type_list = world.file2list("maplestation_modules/strings/slots.txt")
-	if(length(slot_type_list))
-		this_slot_type = pick(slot_type_list)
+	this_slot_type = pick(GLOB.slot_type_descriptions)
 
 /obj/machinery/computer/slot_machine/green/examine(mob/user)
 	. = ..()
 	. += this_slot_type
 	. += span_notice("All proceeds go to continued U.M.E.F. research into advanced gambling techniques!")
 
+/// Always Jackpots
 /obj/machinery/computer/slot_machine/boss
 	name = "THE BOSS' PRIVATE SLOTS"
 	desc = "Now THOSE are odds I like to see!"
 	money = 1000000
-	// Every symbol is a 7
-	symbols = list("<font color='red'>7</font>" = 100)
+
+// It DOES always jackpot though the visuals aren't always matching that fact
+/obj/machinery/computer/slot_machine/boss/ui_static_data(mob/user)
+	var/list/data = ..()
+	data["icons"] = list(list(
+		"icon" = FA_ICON_7,
+		"value" = 1,
+		"colour" = "red"
+		))
+	return data
 
 /obj/machinery/roulette/green
 	name = "AGENT GREEN'S BIG SPIN"
 	anchored = TRUE
-	// Names need to be set when you swipe the ID anyway, so these are more just suggestions
+	// Names need to be set when you swipe the ID anyway, so these are more just suggestions.
+	// We didn't realize that when we made it lol.
 	var/list/possible_names = list(
 		"AGENT GREEN'S BIG SPIN",
 		"AGENT SPIN'S ADVENTURE",