Merge branch 'BeeStation:master' into master

DrDuckedGoose · Jul 30, 2024 · 1500606 · 1500606
2 parents 2d98138 + 1ad761e
commit 1500606
Show file tree

Hide file tree

Showing 25 changed files with 210 additions and 121 deletions.
diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm
@@ -62,8 +62,8 @@
 #define RADIO_KEY_UPLINK "d"
 #define RADIO_TOKEN_UPLINK ":d"
 
-#define MIN_FREE_FREQ 1201 // -------------------------------------------------
-// Frequencies are always odd numbers and range from 1201 to 1599.
+#define MIN_FREE_FREQ 1339 // -------------------------------------------------
+// Frequencies are always odd numbers and range from 1339 to 1599.
 
 #define FREQ_SYNDICATE 1213  //!  Nuke op comms frequency, dark brown
 #define FREQ_UPLINK 1214   //!  Dummy channel for headset uplink

diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm
@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "7.1.2"
+#define TGS_DMAPI_VERSION "7.1.3"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 

diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm
@@ -1221,6 +1221,17 @@
 	tools = list(TOOL_WRENCH, TOOL_WIRECUTTER)
 	category = CAT_MISC
 
+/datum/crafting_recipe/personal_locker
+	name = "Personal Locker"
+	result = /obj/structure/closet/secure_closet/personal/empty
+	time = 10 SECONDS
+	reqs = list(/obj/item/stack/sheet/iron = 2,
+				/obj/item/electronics/airlock = 1,
+				/obj/item/stack/cable_coil = 2
+				)
+	tools = list(TOOL_WIRECUTTER, TOOL_SCREWDRIVER)
+	category = CAT_STRUCTURE
+
 /datum/crafting_recipe/shutters
 	name = "Shutters"
 	reqs = list(/obj/item/stack/sheet/plasteel = 5,

diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm
@@ -230,3 +230,8 @@
 	description = "<span class='nicegreen'>The starlight emanating from space is so mesmerizing.</span>"
 	mood_change = 10
 	timeout = 10 MINUTES
+
+/datum/mood_event/bigplush
+	description = "<span class='nicegreen'>Holding that big plush was quite nice.</span>"
+	mood_change = 1
+	timeout = 10 SECONDS
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
@@ -51,6 +51,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
 		/obj/item/clothing/shoes/wheelys = 2,
 		/obj/item/clothing/shoes/kindleKicks = 2,
 		/obj/item/toy/plush/moth/random = 2,
+		/obj/item/toy/plush/shark = 2,
 		/obj/item/toy/plush/slimeplushie/random = 2,
 		/obj/item/toy/plush/flushed = 2,
 		/obj/item/toy/plush/flushed/rainbow = 1,

diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
@@ -20,7 +20,7 @@
 	interacts_with_air = TRUE
 
 	///The cell we spawn with
-	var/obj/item/stock_parts/cell/cell = /obj/item/stock_parts/cell
+	var/obj/item/stock_parts/cell/cell = null
 	///Is the machine on?
 	var/on = FALSE
 	///What is the mode we are in now?
@@ -47,8 +47,6 @@
 
 /obj/machinery/space_heater/Initialize(mapload)
 	. = ..()
-	if(ispath(cell))
-		cell = new cell(src)
 	update_appearance()
 	SSair.start_processing_machine(src)
 
@@ -57,9 +55,6 @@
 	return..()
 
 /obj/machinery/space_heater/on_deconstruction()
-	if(cell)
-		LAZYADD(component_parts, cell)
-		cell = null
 	return ..()
 
 /obj/machinery/space_heater/examine(mob/user)
@@ -131,12 +126,15 @@
 
 /obj/machinery/space_heater/RefreshParts()
 	. = ..()
+	cell = null
 	var/laser = 0
 	var/cap = 0
 	for(var/obj/item/stock_parts/micro_laser/M in component_parts)
 		laser += M.rating
 	for(var/obj/item/stock_parts/capacitor/M in component_parts)
 		cap += M.rating
+	for(var/obj/item/stock_parts/cell/M in component_parts)
+		cell = M
 
 	heating_power = (laser * 2) * 100000
 	settable_temperature_range = cap * 30
@@ -179,6 +177,7 @@
 		if(!user.transferItemToLoc(I, src))
 			return
 		cell = I
+		component_parts.Add(I)
 		I.add_fingerprint(usr)
 		user.visible_message("<span class='notice'>\The [user] inserts a power cell into \the [src].</span>", "<span class ='notice'>You insert the power cell into \the [src].<span>")
 		SStgui.update_uis(src)
@@ -270,11 +269,13 @@
 					settable_temperature_median + settable_temperature_range)
 		if("eject")
 			if(panel_open && cell)
-				cell.forceMove(drop_location())
 				cell = null
+				for(var/obj/item/stock_parts/cell/M in component_parts)
+					M.forceMove(drop_location())
+					component_parts.Remove(M)
 				. = TRUE
 
-//Space Heaters without cel
+//Space Heaters without a cell
 /obj/machinery/space_heater/no_cell
 	cell = null
 
@@ -287,7 +288,10 @@
 /obj/machinery/space_heater/atmos
 
 /obj/machinery/space_heater/atmos/Initialize(mapload)
-	cell = /obj/item/stock_parts/cell/hyper
+	for(var/obj/item/stock_parts/cell/M in component_parts)
+		QDEL_NULL(M)
+		component_parts.Add(/obj/item/stock_parts/cell/hyper)
+	RefreshParts()
 	. = ..()
 
 #undef HEATER_MODE_STANDBY

diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -506,6 +506,7 @@
 	req_components = list(
 		/obj/item/stock_parts/micro_laser = 1,
 		/obj/item/stock_parts/capacitor = 1,
+		/obj/item/stock_parts/cell = 1,
 		/obj/item/stack/cable_coil = 3)
 	needs_anchored = FALSE