Merge remote-tracking branch 'citrp/master' into servants_of_the_devo…

…urer

.tgs4.yml

@@ -2,6 +2,7 @@ static_files:
   - name: config
     populate: true
   - name: data
+  - name: tmp
 linux_scripts:
   PreCompile.sh: tools/tgs4_scripts/PreCompile.sh
 windows_scripts:

README.md

@@ -56,8 +56,12 @@ These are also the folders you are likely going to encounter while managing the
 - /config: server configuration
   - /legacy: legacy configuration data go in here
 - /data: server persistent data
+  - /asset-cache - default location for caching of generated assets
+  - /asset-root - default location for generated assets to be served in webroot mode
   - /logs: logs are dumped in here
   - /players: player data, like saves and characters get dumped in here
+- /tmp: server scratch space
+  - /assets - for asset generation
 
 You only need to make the top level folders (e.g. config, data) static folders in TGS4.
 

SQL/database_schema.sql

@@ -381,13 +381,6 @@ CREATE TABLE IF NOT EXISTS `%_PREFIX_%privacy` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
-CREATE TABLE IF NOT EXISTS `%_PREFIX_%vr_player_hours` (
-  `ckey` varchar(32) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL,
-  `department` varchar(64) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL,
-  `hours` double NOT NULL,
-  PRIMARY KEY (`ckey`,`department`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-
 CREATE TABLE IF NOT EXISTS `%_PREFIX_%death` (
   `id` INT(11) NOT NULL AUTO_INCREMENT ,
   `pod` TEXT NOT NULL COMMENT 'Place of death' ,

code/__DEFINES/_flags/obj_flags.dm

@@ -20,7 +20,9 @@
 /// Materials have been initialized
 #define OBJ_MATERIAL_INITIALIZED    (1<<9)
 /// no sculpting
-#define OBJ_NO_SCULPTING		(1<<10)
+#define OBJ_NO_SCULPTING			(1<<10)
+/// wall-mounted; facing *towards* the wall we're mounted on (e.g. be NORTH if we're shifted north)
+#define OBJ_WALL_MOUNTED			(1<<11)
 
 DEFINE_BITFIELD(obj_flags, list(
 	BITFIELD(OBJ_EMAGGED),
@@ -34,4 +36,26 @@ DEFINE_BITFIELD(obj_flags, list(
 	BITFIELD(OBJ_MATERIAL_PARTS_MODIFIED),
 	BITFIELD(OBJ_MATERIAL_INITIALIZED),
 	BITFIELD(OBJ_NO_SCULPTING),
+	BITFIELD_NAMED("Wall Mounted", OBJ_WALL_MOUNTED),
+))
+
+//* /obj/var/obj_rotation_flags
+
+/// obj rotation enabled; we'll go to context menu
+#define OBJ_ROTATION_ENABLED (1<<0)
+/// allow defaulting on context menu
+#define OBJ_ROTATION_DEFAULTING (1<<1)
+/// do not perform standard anchor check
+#define OBJ_ROTATION_NO_ANCHOR_CHECK (1<<2)
+/// rotate CCW
+#define OBJ_ROTATION_CCW (1<<3)
+/// give optiosn to rotate both directions
+#define OBJ_ROTATION_BIDIRECTIONAL (1<<4)
+
+DEFINE_BITFIELD(obj_rotation_flags, list(
+	BITFIELD_NAMED("Enabled", OBJ_ROTATION_ENABLED),
+	BITFIELD_NAMED("Defaulting", OBJ_ROTATION_DEFAULTING),
+	BITFIELD_NAMED("Allow Anchored", OBJ_ROTATION_NO_ANCHOR_CHECK),
+	BITFIELD_NAMED("Counterclockwise", OBJ_ROTATION_CCW),
+	BITFIELD_NAMED("Show Both Directions", OBJ_ROTATION_BIDIRECTIONAL),
 ))

code/__DEFINES/_protect.dm

@@ -1,8 +1,11 @@
-#define GENERAL_PROTECT_DATUM(Path)\
+/**
+ * Completely occludes a path from view variable interactions.
+ */
+#define VV_PROTECT(Path)\
 ##Path/can_vv_get(var_name){\
     return FALSE;\
 }\
-##Path/vv_edit_var(var_name, var_value){\
+##Path/vv_edit_var(var_name, var_value, mass_edit, raw_edit){\
     return FALSE;\
 }\
 ##Path/CanProcCall(procname){\
@@ -11,3 +14,16 @@
 ##Path/can_vv_mark(){\
 	return FALSE;\
 }
+
+/**
+ * Makes a path read-only to view variables.
+ *
+ * * Does not prevent the path from being marked!
+ */
+#define VV_PROTECT_READONLY(Path)\
+##Path/vv_edit_var(var_name, var_value, mass_edit, raw_edit){\
+    return FALSE;\
+}\
+##Path/CanProcCall(procname){\
+    return FALSE;\
+}

code/__DEFINES/access.dm

@@ -162,6 +162,7 @@ STANDARD_ACCESS_DATUM(ACCESS_COMMAND_UPLOAD, station/command/upload, "AI Upload"
 #define ACCESS_COMMAND_TELEPORTER 17
 STANDARD_ACCESS_DATUM(ACCESS_COMMAND_TELEPORTER, station/command/teleporter, "Teleporter")
 
+// todo: rename / repath to general high-security storage for command
 #define ACCESS_COMMAND_EVA 18
 STANDARD_ACCESS_DATUM(ACCESS_COMMAND_EVA, station/command/eva, "EVA")
 

code/__DEFINES/controllers/_subsystems.dm

@@ -77,12 +77,28 @@ DEFINE_BITFIELD(runlevels, list(
 
 // todo: tg init brackets
 
+// core security system, used by client/New()
 #define INIT_ORDER_FAIL2TOPIC      200
+// core security system, used by client/New()
 #define INIT_ORDER_IPINTEL         197
+
+// core timing system, used by almost everything
 #define INIT_ORDER_TIMER           195
+// just about every feature on the server requires the database backend
+// for storage and durability of permeance.
 #define INIT_ORDER_DBCORE          190
+// repository is just struct storage. its things depend on database,
+// but should depend on nothing else.
+//
+// for the rare occasion when a prototype requires asset registration,
+// it should be able to recognize if SSassets is ready,
+// and only queue an udpate if its asset is already loaded.
+#define INIT_ORDER_REPOSITORY      187
+// early init initializes what is basically expensive global variables. it needs to go before assets.
 #define INIT_ORDER_EARLY_INIT      185
-#define INIT_ORDER_REPOSITORY      180
+// assets is loaded early because things hook into this to register *their* assets
+#define INIT_ORDER_ASSETS          180
+
 #define INIT_ORDER_STATPANELS      170
 #define INIT_ORDER_PREFERENCES     165
 #define INIT_ORDER_INPUT           160
@@ -93,7 +109,6 @@ DEFINE_BITFIELD(runlevels, list(
 #define INIT_ORDER_VIS             80
 #define INIT_ORDER_SERVER_MAINT    65
 #define INIT_ORDER_INSTRUMENTS     50
-#define INIT_ORDER_EARLY_ASSETS    48
 #define INIT_ORDER_MEDIA_TRACKS    38
 #define INIT_ORDER_CHEMISTRY       35
 #define INIT_ORDER_MATERIALS       34
@@ -112,7 +127,6 @@ DEFINE_BITFIELD(runlevels, list(
 #define INIT_ORDER_AIR            -1
 #define INIT_ORDER_PLANETS        -2
 #define INIT_ORDER_PERSISTENCE    -3
-#define INIT_ORDER_ASSETS         -4
 #define INIT_ORDER_MISC_LATE      -5
 #define INIT_ORDER_HOLOMAPS       -5
 #define INIT_ORDER_NIGHTSHIFT     -5

code/__DEFINES/controllers/assets.dm

@@ -0,0 +1,8 @@
+//* asset loaded status
+
+/// not loaded at all
+#define ASSET_NOT_LOADED 1
+/// loading started, wait
+#define ASSET_IS_LOADING 2
+/// loading finished, go
+#define ASSET_FULLY_LOADED 3

code/__DEFINES/dcs/signals/global_signals.dm

@@ -0,0 +1,12 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2023 Citadel Station developers.          *//
+
+/**
+ * Use SEND_GLOBAL_SIGNAL to send, and
+ * RegisterGlobalSignal to receive.
+ */
+
+/// when a mob is in /Initialize(): (mob/creating)
+#define COMSIG_GLOBAL_MOB_NEW "!global-mob-new"
+/// when a mob is in /Destroy(): (mob/destroying)
+#define COMSIG_GLOBAL_MOB_DEL "!global-mob-del"

code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm

@@ -46,3 +46,6 @@
 
 /// When the transform or an atom is varedited through vv topic.
 ////#define COMSIG_ATOM_VV_MODIFY_TRANSFORM "atom_vv_modify_transform"
+
+/// called when compile_overlays() is ran. args: ()
+#define COMSIG_ATOM_COMPILED_OVERLAYS "atom_compiled_overlays"