Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…

…o ParadiseSS13-master

.gitignore

@@ -5,6 +5,9 @@
 *.dmb
 *.lk
 
+# ignore tmp files generated by icon save operations
+/tmp/*
+
 #ignore any files in config/, except those in subdirectories.
 /config/*
 !config/**/*/

_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm

@@ -10522,9 +10522,7 @@
 	},
 /area/ruin/space/moonbase19)
 "On" = (
-/obj/structure/safe/floor{
-	known_by = list("captain")
-	},
+/obj/structure/safe/floor,
 /obj/structure/sign/singulo{
 	pixel_y = 32
 	},

code/__DEFINES/_click.dm

@@ -0,0 +1,16 @@
+//Defines file for byond click related parameters
+//this is mostly for ease of use and for finding all the things that use say RIGHT_CLICK rather then just searching "right"
+
+//Mouse buttons held
+#define RIGHT_CLICK "right"
+#define MIDDLE_CLICK "middle"
+#define LEFT_CLICK "left"
+
+///Mouse button that was just clicked/released
+///if(modifiers[BUTTON] == LEFT_CLICK)
+#define BUTTON "button"
+
+//Keys held down during the mouse action
+#define CTRL_CLICK "ctrl"
+#define ALT_CLICK "alt"
+#define SHIFT_CLICK "shift"

code/__DEFINES/dcs/signals.dm

@@ -185,6 +185,10 @@
 #define COMSIG_ATOM_HITBY "atom_hitby"
 /// Called when an atom is sharpened or dulled.
 #define COMSIG_ATOM_UPDATE_SHARPNESS "atom_update_sharpness"
+///from base of atom/atom_prehit(obj/item/projectile/P):
+#define COMSIG_ATOM_PREHIT "atom_prehit"
+	#define ATOM_PREHIT_SUCCESS (1<<0)
+	#define ATOM_PREHIT_FAILURE (1<<1)
 
 // Attack signals. These should share the returned flags, to standardize the attack chain.
 // The chain currently works like:
@@ -774,6 +778,9 @@
 #define COMSIG_HUMAN_CHECK_SHIELDS "human_check_shields"
 	#define SHIELD_BLOCK (1<<0)
 
+///from /mob/living/carbon/human/create_mob_hud()
+#define COMSIG_HUMAN_CREATE_MOB_HUD "human_create_mob_hud"
+
 // /datum/species signals
 
 ///from datum/species/on_species_gain(): (datum/species/new_species, datum/species/old_species)

code/__DEFINES/directions.dm

@@ -28,3 +28,6 @@
 #define IS_DIR_DIAGONAL(dir) (dir & (dir - 1))
 /// returns TRUE if direction is cardinal and false if not
 #define IS_DIR_CARDINAL(dir) (!IS_DIR_DIAGONAL(dir))
+
+/// Inverse direction, taking into account UP|DOWN if necessary.
+#define REVERSE_DIR(dir) ( ((dir & 85) << 1) | ((dir & 170) >> 1) )

code/__DEFINES/misc_defines.dm

@@ -171,8 +171,8 @@
 #define MUTANTRACE_LAYER		39
 #define TAIL_UNDERLIMBS_LAYER	38	//Tail split-rendering.
 #define LIMBS_LAYER				37
-#define INTORGAN_LAYER			36
-#define MARKINGS_LAYER			35
+#define MARKINGS_LAYER			36
+#define INTORGAN_LAYER			35
 #define UNDERWEAR_LAYER			34
 #define MUTATIONS_LAYER			33
 #define H_DAMAGE_LAYER			32

code/__DEFINES/preferences_defines.dm

@@ -55,11 +55,11 @@
 // Yes I know this being an "enable to disable" is misleading, but it avoids having to tweak all existing pref entries
 #define PREFTOGGLE_2_REVERB_DISABLE					(1<<9) // 512
 #define PREFTOGGLE_2_FORCE_WHITE_RUNECHAT			(1<<10) // 1024
-#define PREFTOGGLE_2_SIMPLE_STAT_PANEL				(1<<11) // 2048
+// #define PREFTOGGLE_2_SIMPLE_STAT_PANEL			(1<<11) // 2048 Defunct as of 2024-02-14 with browser stat panels
 #define PREFTOGGLE_2_SEE_ITEM_OUTLINES 				(1<<12) // 4096
 #define PREFTOGGLE_2_HIDE_ITEM_TOOLTIPS  			(1<<13) // 8192
 #define PREFTOGGLE_2_THOUGHT_BUBBLE					(1<<14) // 16384
-#define PREFTOGGLE_2_MC_TABS						(1<<15) // 32768
+#define PREFTOGGLE_2_MC_TAB							(1<<15) // 32768
 #define PREFTOGGLE_2_DANCE_DISCO					(1<<16) // 65536
 #define PREFTOGGLE_2_MOD_ACTIVATION_METHOD			(1<<17) // 131072
 #define PREFTOGGLE_2_PARALLAX_IN_DARKNESS			(1<<18) // 262144

code/__DEFINES/procpath.dm

@@ -0,0 +1,30 @@
+/// Represents a proc or verb path.
+///
+/// Despite having no DM-defined static type, proc paths have some variables,
+/// listed below. These are not modifiable, but for a given procpath P,
+/// `new P(null, "Name", "Desc")` can be used to create a new procpath with the
+/// same code but new `name` and `desc` values. The other variables cannot be
+/// changed in this way.
+///
+/// This type exists only to act as an annotation, providing reasonable static
+/// typing for procpaths. Previously, types like `/atom/verb` were used, with
+/// the `name` and `desc` vars of `/atom` thus being accessible. Proc and verb
+/// paths will fail `istype` and `ispath` checks against `/procpath`.
+/procpath
+	// Although these variables are effectively const, if they are marked const
+	// below, their accesses are optimized away.
+
+	/// A text string of the verb's name.
+	var/name = null as text|null
+
+	/// The verb's help text or description.
+	var/desc = null as text|null
+
+	/// The category or tab the verb will appear in.
+	var/category = null as text|null
+
+	/// Only clients/mobs with `see_invisibility` higher can use the verb.
+	var/invisibility = null as num|null
+
+	/// Whether or not the verb appears in statpanel and commandbar when you press space
+	var/hidden = null as num|null

code/__DEFINES/subsystems.dm

@@ -84,6 +84,7 @@
 #define INIT_ORDER_LATE_MAPPING -40
 #define INIT_ORDER_PATH -50
 #define INIT_ORDER_PERSISTENCE -95
+#define INIT_ORDER_STATPANELS -98
 #define INIT_ORDER_CHAT -100 // Should be last to ensure chat remains smooth during init.
 
 // Subsystem fire priority, from lowest to highest priority
@@ -114,6 +115,7 @@
 #define FIRE_PRIORITY_MOBS			100
 #define FIRE_PRIORITY_TGUI			110
 #define FIRE_PRIORITY_TICKER		200
+#define FIRE_PRIORITY_STATPANEL		390
 #define FIRE_PRIORITY_CHAT 			400
 #define FIRE_PRIORITY_RUNECHAT		410 // I hate how high the fire priority on this is -aa
 #define FIRE_PRIORITY_OVERLAYS		500

code/__DEFINES/text_defines.dm

@@ -6,3 +6,6 @@
 #define MAX_CHARACTERS_PER_BOOKPAGE 5000
 #define MAX_SUMMARY_LEN 1500
 #define MAX_NAME_LEN 50 	//diona names can get loooooooong
+
+/// Removes characters incompatible with file names.
+#define SANITIZE_FILENAME(text) (GLOB.filename_forbidden_chars.Replace(text, ""))

code/__HELPERS/files.dm

@@ -77,3 +77,18 @@
 	GLOB.fileaccess_timer = world.time + FTPDELAY
 	return 0
 #undef FTPDELAY
+
+/// Returns the md5 of a file at a given path.
+/proc/md5filepath(path)
+	. = md5(file(path))
+
+/// Save file as an external file then md5 it.
+/// Used because md5ing files stored in the rsc sometimes gives incorrect md5 results.
+/proc/md5asfile(file)
+	var/static/notch = 0
+	// Its importaint this code can handle md5filepath sleeping instead of hard blocking, if it's converted to use rust_g.
+	var/filename = "tmp/md5asfile.[world.realtime].[world.timeofday].[world.time].[world.tick_usage].[notch]"
+	notch = WRAP(notch+1, 0, 2**15)
+	fcopy(file, filename)
+	. = md5filepath(filename)
+	fdel(filename)

code/__HELPERS/filters.dm

@@ -22,15 +22,13 @@ GLOBAL_LIST_INIT(master_filter_info, list(
 			"size" = 1
 		)
 	),
-	/* Not supported because making a proper matrix editor on the frontend would be a huge dick pain.
-		Uncomment if you ever implement it
+	// According to TG, this is not implimented. Anyway, let's use this!
 	"color" = list(
 		"defaults" = list(
 			"color" = matrix(),
 			"space" = FILTER_COLOR_RGB
 		)
 	),
-	*/
 	"displace" = list(
 		"defaults" = list(
 			"x" = 0,