Merge remote-tracking branch 'upstream/master' into light-tweaks

ss220club · Mar 9, 2024 · 75a46b9 · 75a46b9
2 parents 37d134f + 6b6ca2a
commit 75a46b9
Show file tree

Hide file tree

Showing 231 changed files with 3,977 additions and 27,911 deletions.
diff --git a/.gitignore b/.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/**/*/

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_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
 	},

diff --git a/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm
@@ -1183,13 +1183,11 @@
 	icon_state = "0-2";
 	pixel_y = 1
 	},
-/obj/machinery/power/apc/off_station{
-	dir = 8;
+/obj/machinery/power/apc/off_station/directional/west{
 	lighting_channel = 2;
 	locked = 0;
 	environment_channel = 0;
 	equipment_channel = 0;
-	pixel_x = -24;
 	start_charge = 0
 	},
 /turf/simulated/floor/plasteel{
@@ -1876,11 +1874,9 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/machinery/power/apc/off_station{
-	dir = 1;
+/obj/machinery/power/apc/off_station/directional/north{
 	lighting_channel = 0;
 	locked = 0;
-	pixel_y = 24;
 	environment_channel = 0;
 	equipment_channel = 0;
 	operating = 0;
@@ -2879,11 +2875,9 @@
 	pixel_y = 1
 	},
 /obj/structure/spider/stickyweb,
-/obj/machinery/power/apc/off_station{
-	dir = 1;
+/obj/machinery/power/apc/off_station/directional/north{
 	lighting_channel = 2;
 	locked = 0;
-	pixel_y = 24;
 	environment_channel = 0;
 	equipment_channel = 0;
 	start_charge = 0
@@ -3793,13 +3787,11 @@
 	icon_state = "1-2"
 	},
 /obj/structure/spider/stickyweb,
-/obj/machinery/power/apc/off_station{
-	dir = 4;
+/obj/machinery/power/apc/off_station/directional/east{
 	lighting_channel = 2;
 	locked = 0;
 	environment_channel = 2;
 	equipment_channel = 2;
-	pixel_x = 24;
 	start_charge = 100
 	},
 /obj/structure/spider/stickyweb,
@@ -4657,11 +4649,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/machinery/power/apc/off_station{
-	dir = 1;
+/obj/machinery/power/apc/off_station/directional/north{
 	lighting_channel = 2;
 	locked = 0;
-	pixel_y = 24;
 	environment_channel = 1;
 	equipment_channel = 0;
 	start_charge = 100
@@ -4716,11 +4706,9 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc/off_station{
-	dir = 1;
+/obj/machinery/power/apc/off_station/directional/north{
 	lighting_channel = 2;
 	locked = 0;
-	pixel_y = 24;
 	environment_channel = 0;
 	equipment_channel = 0;
 	start_charge = 0
@@ -6260,10 +6248,9 @@
 /area/awaymission/BMPship/TurretsSouth)
 "Nq" = (
 /obj/structure/cable,
-/obj/machinery/power/apc/off_station{
+/obj/machinery/power/apc/off_station/directional/south{
 	lighting_channel = 2;
 	locked = 0;
-	pixel_y = -24;
 	environment_channel = 0;
 	equipment_channel = 0;
 	start_charge = 0
@@ -6337,13 +6324,11 @@
 	icon_state = "0-2";
 	pixel_y = 1
 	},
-/obj/machinery/power/apc/off_station{
-	dir = 8;
+/obj/machinery/power/apc/off_station/directional/west{
 	lighting_channel = 2;
 	locked = 0;
 	environment_channel = 0;
 	equipment_channel = 0;
-	pixel_x = -24;
 	start_charge = 0
 	},
 /turf/simulated/floor/engine,
@@ -6982,10 +6967,8 @@
 	icon_state = "2-8"
 	},
 /obj/structure/alien/resin,
-/obj/machinery/power/apc/off_station{
-	dir = 1;
+/obj/machinery/power/apc/off_station/directional/north{
 	lighting_channel = 0;
-	pixel_y = 24;
 	environment_channel = 0;
 	equipment_channel = 0;
 	operating = 0;
@@ -7137,13 +7120,11 @@
 "XH" = (
 /obj/item/trash/tastybread,
 /obj/structure/cable,
-/obj/machinery/power/apc/off_station{
-	dir = 8;
+/obj/machinery/power/apc/off_station/directional/west{
 	lighting_channel = 2;
 	locked = 0;
 	environment_channel = 0;
 	equipment_channel = 0;
-	pixel_x = -24;
 	start_charge = 0
 	},
 /turf/simulated/floor/plasteel{

diff --git a/_maps/map_files220/RandomZLevels/caves.dmm b/_maps/map_files220/RandomZLevels/caves.dmm
@@ -4922,9 +4922,7 @@
 	},
 /area/awaymission/caves)
 "zk" = (
-/obj/machinery/power/apc/off_station/empty_charge{
-	pixel_y = -24
-	},
+/obj/machinery/power/apc/off_station/empty_charge/directional/south,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"

diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm
@@ -30538,7 +30538,6 @@
 "csf" = (
 /obj/structure/cable,
 /obj/machinery/power/apc/directional/south,
-/obj/effect/landmark/damageturf,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "black"
@@ -33961,6 +33960,11 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "red"
@@ -50036,6 +50040,11 @@
 /obj/machinery/door/firedoor,
 /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
 /obj/effect/mapping_helpers/airlock/access/any/service/theatre,
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/fore)
 "eBE" = (
@@ -55237,11 +55246,7 @@
 /turf/simulated/floor/wood/fancy/cherry,
 /area/station/legal/lawoffice)
 "gkj" = (
-/obj/machinery/power/apc{
-	cell_type = 25000;
-	dir = 4;
-	name = "Courtroom";
-	pixel_x = 24;
+/obj/machinery/power/apc/critical/directional/east{
 	shock_proof = 1
 	},
 /obj/structure/cable{
@@ -62437,7 +62442,7 @@
 	name = "Toxins Venting Bay Door";
 	power_state = 0
 	},
-/turf/simulated/wall/r_wall,
+/turf/simulated/floor/engine,
 /area/station/science/toxins/mixing)
 "ivI" = (
 /obj/item/kirbyplants,
@@ -62510,6 +62515,7 @@
 	name = "Toxins Launcher Bay Door";
 	protected = 0
 	},
+/obj/structure/fans/tiny,
 /turf/simulated/floor/plating,
 /area/station/science/toxins/launch)
 "ixA" = (
@@ -83742,6 +83748,11 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 4
 	},
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "red"
@@ -102821,11 +102832,7 @@
 /obj/structure/table/wood,
 /obj/item/food/snacks/grown/poppy/geranium,
 /obj/item/soap/deluxe,
-/obj/machinery/power/apc{
-	cell_type = 25000;
-	dir = 4;
-	name = "Courtroom";
-	pixel_x = 24;
+/obj/machinery/power/apc/critical/directional/east{
 	shock_proof = 1
 	},
 /obj/structure/cable{
@@ -103617,11 +103624,7 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc{
-	cell_type = 25000;
-	dir = 4;
-	name = "Courtroom";
-	pixel_x = 24;
+/obj/machinery/power/apc/critical/directional/east{
 	shock_proof = 1
 	},
 /turf/simulated/floor/wood/oak,
@@ -111433,11 +111436,7 @@
 	pixel_x = -5;
 	pixel_y = 2
 	},
-/obj/machinery/power/apc{
-	cell_type = 25000;
-	dir = 4;
-	name = "Courtroom";
-	pixel_x = 24;
+/obj/machinery/power/apc/critical/directional/east{
 	shock_proof = 1
 	},
 /obj/structure/cable{

diff --git a/_maps/map_files220/generic/Lavaland.dmm b/_maps/map_files220/generic/Lavaland.dmm
@@ -616,11 +616,7 @@
 /turf/simulated/floor/plasteel,
 /area/mine/laborcamp)
 "bB" = (
-/obj/machinery/power/apc{
-	dir = 1;
-	name = "Labor Camp APC";
-	pixel_y = 24
-	},
+/obj/machinery/power/apc/directional/north,
 /obj/machinery/computer/cryopod{
 	pixel_y = 38
 	},
@@ -6237,10 +6233,7 @@
 /turf/simulated/floor/indestructible/boss,
 /area/lavaland/surface/outdoors/legion)
 "vf" = (
-/obj/machinery/power/apc{
-	name = "Labor Camp Security APC";
-	pixel_y = -24
-	},
+/obj/machinery/power/apc/directional/south,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},

diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm
@@ -29046,10 +29046,7 @@
 	},
 /area/centcom/ss220/admin3)
 "udY" = (
-/obj/machinery/power/apc{
-	name = "Gamma Armory APC";
-	pixel_y = -24
-	},
+/obj/machinery/power/apc/directional/south,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"

diff --git a/code/__DEFINES/_click.dm b/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"
diff --git a/code/__DEFINES/dcs/signals.dm b/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)

diff --git a/code/__DEFINES/directions.dm b/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) )
diff --git a/code/__DEFINES/misc_defines.dm b/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

diff --git a/code/__DEFINES/preferences_defines.dm b/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