Merge

.github/workflows/changelog_generation.yml

@@ -16,7 +16,7 @@ jobs:
     if: github.repository == 'SierraBay/SierraBay12' # to prevent this running on forks
     steps:
       - name: Checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
         with:
           fetch-depth: 0 # Otherwise, we will fail to push refs
           ref: dev-sierra

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
+      uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/generate_documentation.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
       - name: paths-filter
         uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50
         id: filter
@@ -37,9 +37,9 @@ jobs:
       group: ${{ github.workflow }}-${{ github.ref }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
       - name: Setup Cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
         with:
           path: ~/spaceman_dmm/${{ env.SPACEMAN_DMM_VERSION }}
           key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }}

.github/workflows/make_changelogs.yml

@@ -16,7 +16,7 @@ jobs:
     if: github.repository == 'SierraBay/SierraBay12' # to prevent this running on forks
     steps:
       - name: Checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
         with:
           fetch-depth: 25
       - name: Python setup

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
       - name: paths-filter
         uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50
         id: filter
@@ -30,9 +30,9 @@ jobs:
     needs: PreFlight
     if: needs.PreFlight.outputs.dm == 'true'
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
       - name: Setup Cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
         with:
           path: ~/spaceman_dmm/${{ env.SPACEMAN_DMM_VERSION }}
           key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }}
@@ -58,9 +58,9 @@ jobs:
     - DreamChecker
     if: needs.PreFlight.outputs.dm == 'true'
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
       - name: Setup Cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
         with:
           path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
@@ -88,9 +88,9 @@ jobs:
     - DreamChecker
     if: needs.PreFlight.outputs.dm == 'true'
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
       - name: Setup Cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
         with:
           path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
@@ -117,9 +117,9 @@ jobs:
     - DreamChecker
     if: needs.PreFlight.outputs.dm == 'true'
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
       - name: Setup Cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
         with:
           path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
@@ -146,9 +146,9 @@ jobs:
     - DreamChecker
     if: needs.PreFlight.outputs.dm == 'true'
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
       - name: Setup Cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
         with:
           path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}

README.md

@@ -31,7 +31,7 @@
 
 ### Безопасность
 
-С Политикой Безопасности этого репозитория, а также с тем, как репортить уязвисости ты можешь ознакомиться в [`/docs/SECURITY.md`](/docs/SECURITY.md).
+С Политикой Безопасности этого репозитория, а также с тем, как репортить уязвимости ты можешь ознакомиться в [`/docs/SECURITY.md`](/docs/SECURITY.md).
 
 ---
 

baystation12.dme

@@ -20,6 +20,7 @@
 #include "code\__datastructures\priority_queue.dm"
 #include "code\__datastructures\stack.dm"
 #include "code\__defines\__compile_options.dm"
+#include "code\__defines\__dview.dm"
 #include "code\__defines\__initialization.dm"
 #include "code\__defines\__renderer.dm"
 #include "code\__defines\_excom.dm"
@@ -188,6 +189,7 @@
 #include "code\controllers\subsystems\air.dm"
 #include "code\controllers\subsystems\airflow.dm"
 #include "code\controllers\subsystems\alarm.dm"
+#include "code\controllers\subsystems\ambient_lighting.dm"
 #include "code\controllers\subsystems\ao.dm"
 #include "code\controllers\subsystems\atoms.dm"
 #include "code\controllers\subsystems\chat.dm"
@@ -1248,6 +1250,7 @@
 #include "code\game\objects\structures\crates_lockers\closets\coffin.dm"
 #include "code\game\objects\structures\crates_lockers\closets\crittercrate.dm"
 #include "code\game\objects\structures\crates_lockers\closets\fitness.dm"
+#include "code\game\objects\structures\crates_lockers\closets\fridge.dm"
 #include "code\game\objects\structures\crates_lockers\closets\gimmick.dm"
 #include "code\game\objects\structures\crates_lockers\closets\job_closets.dm"
 #include "code\game\objects\structures\crates_lockers\closets\l3closet.dm"
@@ -1260,7 +1263,6 @@
 #include "code\game\objects\structures\crates_lockers\closets\secure\bar.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\cargo.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\engineering.dm"
-#include "code\game\objects\structures\crates_lockers\closets\secure\freezer.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\hydroponics.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\medical.dm"
@@ -1991,11 +1993,12 @@
 #include "code\modules\library\manuals\medical.dm"
 #include "code\modules\library\manuals\nanotrasen.dm"
 #include "code\modules\library\manuals\union.dm"
+#include "code\modules\lighting\_lighting_defs.dm"
+#include "code\modules\lighting\darksight.dm"
 #include "code\modules\lighting\lighting_area.dm"
 #include "code\modules\lighting\lighting_atom.dm"
 #include "code\modules\lighting\lighting_corner.dm"
 #include "code\modules\lighting\lighting_overlay.dm"
-#include "code\modules\lighting\lighting_planemaster.dm"
 #include "code\modules\lighting\lighting_setup.dm"
 #include "code\modules\lighting\lighting_source.dm"
 #include "code\modules\lighting\lighting_turf.dm"
@@ -2070,6 +2073,7 @@
 #include "code\modules\mining\machinery\mineral_unloader.dm"
 #include "code\modules\mob\animations.dm"
 #include "code\modules\mob\death.dm"
+#include "code\modules\mob\dview.dm"
 #include "code\modules\mob\examinations.dm"
 #include "code\modules\mob\gender.dm"
 #include "code\modules\mob\hear_say.dm"
@@ -3312,6 +3316,7 @@
 #include "mods\_modpack.dm"
 #include "mods\global_modpacks.dm"
 #include "mods\_master_files\code\game\objects\effects\decals\contraband.dm"
+#include "mods\_master_files\code\game\objects\structures\crates_lockers\closets\_closet_appearance_definitions.dm"
 #include "mods\_master_files\code\modules\client\asset_cache.dm"
 #include "mods\_master_files\code\modules\events\gravity.dm"
 #include "mods\_master_files\code\modules\mob\new_player\new_player.dm"

code/__defines/MC.dm

@@ -169,3 +169,9 @@ if(Datum.is_processing) {\
 ****/
 
 #define addtimer(args...) _addtimer(args, source ="[__FILE__]#[__LINE__]")
+
+/****
+ *  Helper for waits
+ ****/
+
+#define UNTIL(X) while(!(X)) stoplag()

code/__defines/__dview.dm

@@ -0,0 +1,14 @@
+//DVIEW defines
+
+#define FOR_DVIEW(type, range, center, invis_flags) \
+	global.dview_mob.loc = center; \
+	global.dview_mob.see_invisible = invis_flags; \
+	for(type in view(range, dview_mob))
+
+#define END_FOR_DVIEW dview_mob.loc = null
+
+#define DVIEW(output, range, center, invis_flags) \
+	global.dview_mob.loc = center; \
+	global.dview_mob.see_invisible = invis_flags; \
+	output = view(range, dview_mob); \
+	global.dview_mob.loc = null;

code/__defines/_renderer.dm

@@ -190,13 +190,6 @@ GLOBAL_LIST_EMPTY(zmimic_renderers)
 	plane = LIGHTING_PLANE
 	appearance_flags = PLANE_MASTER | NO_CLIENT_COLOR
 	relay_blend_mode = BLEND_MULTIPLY
-	color = list(
-		-1,  0,  0,  0, // R
-		 0, -1,  0,  0, // G
-		 0,  0, -1,  0, // B
-		 0,  0,  0,  0, // A
-		 1,  1,  1,  1  // Mapping
-	)
 	mouse_opacity = MOUSE_OPACITY_UNCLICKABLE
 
 
@@ -299,22 +292,18 @@ GLOBAL_LIST_EMPTY(zmimic_renderers)
 			vis_contents -= gas_heat_object
 
 		if (quality == GLOB.PREF_LOW)
-			if(!istype(gas_heat_object, /obj/effect/heat))
-				QDEL_NULL(gas_heat_object)
-				gas_heat_object = new /obj/effect/heat(null)
+			QDEL_NULL(gas_heat_object)
+			gas_heat_object = new /obj/effect/heat(null)
 		else
-			if(!istype(gas_heat_object, /obj/particle_emitter/heat))
-				QDEL_NULL(gas_heat_object)
-				gas_heat_object = new /obj/particle_emitter/heat(null, -1)
+			QDEL_NULL(gas_heat_object)
 			if (quality == GLOB.PREF_MED)
-				gas_heat_object.particles?.count = 250
-				gas_heat_object.particles?.spawning = 15
+				gas_heat_object = new /obj/particle_emitter/heat(null)
 			else if (quality == GLOB.PREF_HIGH)
-				gas_heat_object.particles?.count = 600
-				gas_heat_object.particles?.spawning = 35
+				gas_heat_object = new /obj/particle_emitter/heat/high(null)
 
 		vis_contents += gas_heat_object
 
+
 /atom/movable/renderer/heat/Initialize()
 	. = ..()
 	Setup()

code/__defines/lighting.dm

@@ -1,29 +1,42 @@
-#define FOR_DVIEW(type, range, center, invis_flags) \
-	GLOB.dview_mob.loc = center; \
-	GLOB.dview_mob.see_invisible = invis_flags; \
-	for(type in view(range, GLOB.dview_mob))
+#define LIGHTING_INTERVAL       1     // Frequency, in 1/10ths of a second, of the lighting process.
 
-#define END_FOR_DVIEW GLOB.dview_mob.loc = null
+#define LIGHTING_HEIGHT         1 // height off the ground of light sources on the pseudo-z-axis, you should probably leave this alone
+#define LIGHTING_Z_FACTOR       10 // Z diff is multiplied by this and LIGHTING_HEIGHT to get the final height of a light source. Affects how much darker A Z light gets with each level transitioned.
+#define LIGHTING_ROUND_VALUE    (1 / 200) //Value used to round lumcounts, values smaller than 1/255 don't matter (if they do, thanks sinking points), greater values will make lighting less precise, but in turn increase performance, VERY SLIGHTLY.
 
 #define LIGHTING_ICON 'icons/effects/lighting_overlay.dmi' // icon used for lighting shading effects
-#define LIGHTING_ICON_STATE_DARK "dark" // Change between "soft_dark" and "dark" to swap soft darkvision
+#define LIGHTING_BASE_ICON_STATE "matrix"	// icon_state used for normal color-matrix based lighting overlays.
+#define LIGHTING_STATION_ICON_STATE "tubedefault"	// icon_state used for lighting overlays that are just displaying standard station lighting.
+#define LIGHTING_DARKNESS_ICON_STATE "black"	// icon_state used for lighting overlays with no luminosity.
+#define LIGHTING_TRANSPARENT_ICON_STATE "blank"
 
-#define LIGHTING_ROUND_VALUE (1 / 64) // Value used to round lumcounts, values smaller than 1/69 don't matter (if they do, thanks sinking points), greater values will make lighting less precise, but in turn increase performance, VERY SLIGHTLY.
+#define LIGHTING_BLOCKED_FACTOR 0.5	// How much the range of a directional light will be reduced while facing a wall.
 
-#define LIGHTING_SOFT_THRESHOLD 0 // If the max of the lighting lumcounts of each spectrum drops below this, disable luminosity on the lighting overlays.  This also should be the transparancy of the "soft_dark" icon state.
+// If defined, instant updates will be used whenever server load permits. Otherwise queued updates are always used.
+#define USE_INTELLIGENT_LIGHTING_UPDATES
+
+/// Maximum light_range before forced to always queue instead of using sync updates. Setting this too high will cause server stutter with moving large lights.
+#define LIGHTING_MAXIMUM_INSTANT_RANGE 8
+
+// mostly identical to below, but doesn't make sure T is valid first. Should only be used by lighting code.
+#define TURF_IS_DYNAMICALLY_LIT_UNSAFE(T) ((T:dynamic_lighting && T:loc:dynamic_lighting))
+#define TURF_IS_DYNAMICALLY_LIT(T) (isturf(T) && TURF_IS_DYNAMICALLY_LIT_UNSAFE(T))
+
+// Note: this does not imply the above, a turf can have ambient light without being dynamically lit.
+#define TURF_IS_AMBIENT_LIT_UNSAFE(T) (T:ambient_active)
+#define TURF_IS_AMBIENT_LIT(T) (isturf(T) && TURF_IS_AMBIENT_LIT_UNSAFE(T))
 
-#define LIGHTING_MULT_FACTOR 0.9
 
 // If I were you I'd leave this alone.
 #define LIGHTING_BASE_MATRIX \
-	list                     \
-	(                        \
-		LIGHTING_SOFT_THRESHOLD, LIGHTING_SOFT_THRESHOLD, LIGHTING_SOFT_THRESHOLD, 0, \
-		LIGHTING_SOFT_THRESHOLD, LIGHTING_SOFT_THRESHOLD, LIGHTING_SOFT_THRESHOLD, 0, \
-		LIGHTING_SOFT_THRESHOLD, LIGHTING_SOFT_THRESHOLD, LIGHTING_SOFT_THRESHOLD, 0, \
-		LIGHTING_SOFT_THRESHOLD, LIGHTING_SOFT_THRESHOLD, LIGHTING_SOFT_THRESHOLD, 0, \
-		0, 0, 0, 1           \
-	)
+	list            \
+	(               \
+		1, 1, 1, 0, \
+		1, 1, 1, 0, \
+		1, 1, 1, 0, \
+		1, 1, 1, 0, \
+		0, 0, 0, 1  \
+	)               \
 
 // Helpers so we can (more easily) control the colour matrices.
 #define CL_MATRIX_RR 1
@@ -47,12 +60,25 @@
 #define CL_MATRIX_CB 19
 #define CL_MATRIX_CA 20
 
+// Higher numbers override lower.
+#define LIGHTING_NO_UPDATE 0
+#define LIGHTING_VIS_UPDATE 1
+#define LIGHTING_CHECK_UPDATE 2
+#define LIGHTING_FORCE_UPDATE 3
+
 // Lightbulb statuses
 #define LIGHT_OK 		0 // A light bulb is installed and functioning.
 #define LIGHT_EMPTY		1 // There is no light bulb installed.
 #define LIGHT_BROKEN	2 // The light bulb is broken/shattered.
 #define LIGHT_BURNED	3 // The light bulb is burned out.
 
+// This color of overlay is very common - most of the station is this color when lit fully.
+// Tube lights are a bluish-white, so we can't just assume 1-1-1 is full-illumination.
+// -- If you want to change these, find them *by checking in-game*, just converting tubes' RGB color into floats will not work!
+#define LIGHTING_DEFAULT_TUBE_R 0.96
+#define LIGHTING_DEFAULT_TUBE_G 1
+#define LIGHTING_DEFAULT_TUBE_B 1
+
 // Lighting color presets
 #define LIGHT_COLOUR_WHITE	"#fefefe" // Clinical white light bulbs
 #define LIGHT_COLOUR_WARM	"#fffee0" // Warm yellowish light bulbs
@@ -84,3 +110,16 @@
 #define AREA_LIGHTING_WARM		"warm"
 #define AREA_LIGHTING_COOL		"cool"
 #define AREA_LIGHTING_DEFAULT	"default" // For light replacers, defaults to whatever the area is set to. For areas, uses the initial lighting value from the light bulb itself.
+
+// Some angle presets for directional lighting.
+#define LIGHT_OMNI null
+#define LIGHT_SEMI 180
+#define LIGHT_VERY_WIDE 135
+#define LIGHT_WIDE 90
+#define LIGHT_NARROW 45
+
+#define DARKSIGHT_GRADIENT_SIZE 480
+// Max number of ambient groups, amount over this value will simply not be created
+#define AMBIENT_GROUP_MAX_BITS 24
+// Ambient group used for exterior turfs not on planets - Could also replace Space turf legacy starlight implementation
+#define SPACE_AMBIENT_GROUP 1

code/__defines/misc.dm

@@ -259,14 +259,10 @@
 //Lying animation
 #define ANIM_LYING_TIME 2
 
-
-//Planet habitability weight
-#define HABITABILITY_LOCKED			1
-#define HABITABILITY_TYPICAL		2
-#define HABITABILITY_BAD 			3
-#define HABITABILITY_EXTREME		4
-#define HABITABILITY_RANDOM			5
-
+//Planet habitability class
+#define HABITABILITY_IDEAL  1
+#define HABITABILITY_OKAY  2
+#define HABITABILITY_BAD  3
 
 #ifndef WINDOWS_HTTP_POST_DLL_LOCATION
 #define WINDOWS_HTTP_POST_DLL_LOCATION "lib/byhttp.dll"
@@ -342,3 +338,5 @@
 #define SANITY_CHECK_TOPIC_PHYSICALLY_INTERACT FLAG(6)
 
 #define SANITY_CHECK_DEFAULT (SANITY_CHECK_TOOL_IN_HAND | SANITY_CHECK_BOTH_ADJACENT)
+
+#define Z_ALL_TURFS(Z) block(locate(1, 1, Z), locate(world.maxx, world.maxy, Z))

code/__defines/mobs.dm

@@ -126,9 +126,9 @@
 #define DEFAULT_ATTACK_COOLDOWN 8 //Default timeout for aggressive actions
 #define DEFAULT_QUICK_COOLDOWN  4
 
-#define FAST_WEAPON_COOLDOWN 5
-#define DEFAULT_WEAPON_COOLDOWN 10
-#define SLOW_WEAPON_COOLDOWN 15
+#define FAST_WEAPON_COOLDOWN 3
+#define DEFAULT_WEAPON_COOLDOWN 5
+#define SLOW_WEAPON_COOLDOWN 7
 
 #define MIN_SUPPLIED_LAW_NUMBER 15
 #define MAX_SUPPLIED_LAW_NUMBER 50