Voreupdate [MDB IGNORE] [IDB IGNORE]

ATTRIBUTIONS.md

@@ -53,4 +53,17 @@
 **File:** `sound/ambience/startup.ogg` and `sound/ambience/shutdown.ogg`<br>
 **Title:** Spaceship starup and shutdown<br>
 **Creator:** viznoman (https://freesound.org/people/viznoman/sounds/267308/)<br>
-**License:** [CC BY 3.0](http://creativecommons.org/licenses/by/3.0/)<br>
+**License:** [CC BY 3.0](http://creativecommons.org/licenses/by/3.0/)<br>
+<br>
+**File:** `icons/obj/pillows.dmi`<br>
+**Title:** pillows.dmi<br>
+**Creator:** Lamella-0587 (https://github.com/Skyrat-SS13/Skyrat-tg/pull/6740)<br>
+**License:** [CC BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)<br>
+<br>
+**File:** `icons/mob/vore/taurs_vr_loaf.dmi`and `icons/mob/vore/taurs_vr.dmi`<br>
+**Title:** Deer tummy<br>
+**Icon-States:** `fatdeer_s` and `fatdeer_markings`<br>
+**Creator:** VerySoft (https://github.com/TS-Rogue-Star/Rogue-Star/pull/153)<br>
+**URL:** [Website](https://rogue-star.net/)<br>
+**License:** [CC BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)<br>
+**Notes:** Permission to use assets also given in writing. These new icon-states are modifications of existing icon-states.<br>

code/ATMOSPHERICS/datum_pipe_network.dm

@@ -1,5 +1,3 @@
-var/global/list/datum/pipe_network/pipe_networks = list()	// TODO - Move into SSmachines
-
 /datum/pipe_network
 	var/list/datum/gas_mixture/gases = list() //All of the gas_mixtures continuously connected in this network
 	var/volume = 0	//caches the total volume for atmos machines to use in gas calculations

code/ATMOSPHERICS/pipes/simple.dm

@@ -96,7 +96,7 @@
 		node1 = null
 	if(node2)
 		node2.disconnect(src)
-		node1 = null
+		node2 = null
 
 	. = ..()
 

code/__defines/admin_vr.dm

@@ -16,4 +16,5 @@
 #define MODIFIY_ROBOT_SWAP_MODULE	"Swap a Robot Module"
 #define MODIFIY_ROBOT_RESET_MODULE	"Fully Reset Robot Module"
 #define MODIFIY_ROBOT_TOGGLE_ERT	"Toggle ERT Module Overwrite"
+#define MODIFIY_ROBOT_TOGGLE_STATION_ACCESS "Toggle All Station Access Codes"
 #define MODIFIY_ROBOT_TOGGLE_CENT_ACCESS	"Toggle Central Access Codes"

code/__defines/atoms_movable.dm

@@ -0,0 +1,7 @@
+/*
+** Holds defines for code\game\atoms_movable.dm to avoid magic numbers and potential unexpected overwrites down the line
+*/
+
+#define DEFAULT_ICON_SCALE_X 1
+#define DEFAULT_ICON_SCALE_Y 1
+#define DEFAULT_ICON_ROTATION 0

code/__defines/belly_modes_vr.dm

@@ -36,3 +36,9 @@
 #define MIN_NUTRITION_TO_GAIN	450	// Above this amount you will gain weight
 #define MAX_NUTRITION_TO_LOSE	50	// Below this amount you will lose weight
 // #define WEIGHT_PER_NUTRITION	0.0285 // Tuned so 1050 (nutrition for average mob) = 30 lbs
+
+// Drain modes
+#define DR_NORMAL								"Normal"
+#define DR_SLEEP 								"Sleep"
+#define DR_FAKE									"False Sleep"
+#define DR_WEIGHT								"Weight Drain"

code/__defines/chat.dm

@@ -11,6 +11,7 @@
 #define MESSAGE_TYPE_SYSTEM "system"
 #define MESSAGE_TYPE_LOCALCHAT "localchat"
 #define MESSAGE_TYPE_NPCEMOTE "npcemote"
+#define MESSAGE_TYPE_MULTIZCHAT "multizsay"
 #define MESSAGE_TYPE_PLOCALCHAT "plocalchat"
 #define MESSAGE_TYPE_HIVEMIND "hivemind"
 #define MESSAGE_TYPE_RADIO "radio"

code/__defines/color_priority.dm

@@ -0,0 +1,11 @@
+//different types of atom colorations
+///only used by rare effects like greentext coloring mobs and when admins varedit color
+#define ADMIN_COLOUR_PRIORITY 		1
+///e.g. purple effect of the revenant on a mob, black effect when mob electrocuted
+#define TEMPORARY_COLOUR_PRIORITY 	2
+///color splashed onto an atom (e.g. paint on turf)
+#define WASHABLE_COLOUR_PRIORITY 	3
+///color inherent to the atom (e.g. blob color)
+#define FIXED_COLOUR_PRIORITY 		4
+///how many priority levels there are.
+#define COLOUR_PRIORITY_AMOUNT 4

code/__defines/lum.dm

@@ -0,0 +1,4 @@
+//Luma coefficients suggested for HDTVs. If you change these, make sure they add up to 1.
+#define LUMA_R 0.213
+#define LUMA_G 0.715
+#define LUMA_B 0.072

code/__defines/machinery.dm

@@ -157,17 +157,17 @@ if (!(DATUM.datum_flags & DF_ISPROCESSING)) {\
 #define STOP_PROCESSING_IN_LIST(DATUM, LIST) LIST.Remove(DATUM);DATUM.datum_flags &= ~DF_ISPROCESSING
 
 // Note - I would prefer these be defined machines.dm, but some are used prior in file order. ~Leshana
-#define START_MACHINE_PROCESSING(Datum) START_PROCESSING_IN_LIST(Datum, global.processing_machines)
-#define STOP_MACHINE_PROCESSING(Datum) STOP_PROCESSING_IN_LIST(Datum, global.processing_machines)
+#define START_MACHINE_PROCESSING(Datum) START_PROCESSING_IN_LIST(Datum, SSmachines.processing_machines)
+#define STOP_MACHINE_PROCESSING(Datum) STOP_PROCESSING_IN_LIST(Datum, SSmachines.processing_machines)
 
-#define START_PROCESSING_PIPENET(Datum) START_PROCESSING_IN_LIST(Datum, global.pipe_networks)
-#define STOP_PROCESSING_PIPENET(Datum) STOP_PROCESSING_IN_LIST(Datum, global.pipe_networks)
+#define START_PROCESSING_PIPENET(Datum) START_PROCESSING_IN_LIST(Datum, SSmachines.networks)
+#define STOP_PROCESSING_PIPENET(Datum) STOP_PROCESSING_IN_LIST(Datum, SSmachines.networks)
 
-#define START_PROCESSING_POWERNET(Datum) START_PROCESSING_IN_LIST(Datum, global.powernets)
-#define STOP_PROCESSING_POWERNET(Datum) STOP_PROCESSING_IN_LIST(Datum, global.powernets)
+#define START_PROCESSING_POWERNET(Datum) START_PROCESSING_IN_LIST(Datum, SSmachines.powernets)
+#define STOP_PROCESSING_POWERNET(Datum) STOP_PROCESSING_IN_LIST(Datum, SSmachines.powernets)
 
-#define START_PROCESSING_POWER_OBJECT(Datum) START_PROCESSING_IN_LIST(Datum, global.processing_power_items)
-#define STOP_PROCESSING_POWER_OBJECT(Datum) STOP_PROCESSING_IN_LIST(Datum, global.processing_power_items)
+#define START_PROCESSING_POWER_OBJECT(Datum) START_PROCESSING_IN_LIST(Datum, SSmachines.powerobjs)
+#define STOP_PROCESSING_POWER_OBJECT(Datum) STOP_PROCESSING_IN_LIST(Datum, SSmachines.powerobjs)
 
 // Computer login types
 #define LOGIN_TYPE_NORMAL 1

code/__defines/misc_vr.dm

@@ -14,6 +14,11 @@
 #define VANTAG_KIDNAP  "vantag_kidnap"
 #define VANTAG_KILL    "vantag_kill"
 
+// ColorMate states
+#define COLORMATE_TINT 1
+#define COLORMATE_HSV 2
+#define COLORMATE_MATRIX 3
+
 #define DEPARTMENT_OFFDUTY			"Off-Duty"
 
 #define ANNOUNCER_NAME "Facility PA"

code/__defines/text.dm

@@ -0,0 +1,10 @@
+/**
+ * Holds global defines for use in text input procedures
+ */
+
+
+/**
+ * stuff like `copytext(input, length(input))` will trim the last character of the input,
+ * because DM does it so it copies until the char BEFORE the `end` arg, so we need to bump `end` by 1 in these cases.
+ */
+#define PREVENT_CHARACTER_TRIM_LOSS(integer) (integer + 1)

code/_helpers/icons.dm

@@ -80,8 +80,8 @@
 	Blend(M, ICON_ADD)
 
 /proc/BlendRGB(rgb1, rgb2, amount)
-	var/list/RGB1 = rgb2num(rgb1)
-	var/list/RGB2 = rgb2num(rgb2)
+	var/list/RGB1 = ReadRGB(rgb1)
+	var/list/RGB2 = ReadRGB(rgb2)
 
 	// add missing alpha if needed
 	if(RGB1.len < RGB2.len) RGB1 += 255