Merge branch 'master' into paradrop

.github/add_labels.py

@@ -1,19 +1,19 @@
 import os, re
-from github import Github
+from github import Github, GithubException
 
 # Format - Key: Array[Label, [StringsToIgnore]]
 changelogToPrefix = {
-	'fix': ["Fix", ["fixed a few things"]],
-	'qol': ["Quality of Life", ["made something easier to use"]],
-	'add': ["Feature", ["Added new mechanics or gameplay changes", "Added more things"]],
-	'del': ["Removal", ["Removed old things"]],
-	'spellcheck': ["Grammar and Formatting", ["fixed a few typos"]],
-	'balance': ["Balance", ["rebalanced something"]],
-	'code': ["Code Improvement", ["changed some code"]],
-	'refactor': ["Refactor", ["refactored some code"]],
-	'config': ["Config", ["changed some config setting"]],
-	'admin': ["Admin", ["messed with admin stuff"]],
-	'server': ["Server", ["something server ops should know"]],
+    'fix': ["Fix", ["fixed a few things"]],
+    'qol': ["Quality of Life", ["made something easier to use"]],
+    'add': ["Feature", ["Added new mechanics or gameplay changes", "Added more things"]],
+    'del': ["Removal", ["Removed old things"]],
+    'spellcheck': ["Grammar and Formatting", ["fixed a few typos"]],
+    'balance': ["Balance", ["rebalanced something"]],
+    'code': ["Code Improvement", ["changed some code"]],
+    'refactor': ["Refactor", ["refactored some code"]],
+    'config': ["Config", ["changed some config setting"]],
+    'admin': ["Admin", ["messed with admin stuff"]],
+    'server': ["Server", ["something server ops should know"]],
     'soundadd': ["Sound", ["added a new sound thingy"]],
     'sounddel': ["Sound", ["removed an old sound thingy"]],
     'imageadd': ["Sprites", ["added some icons and images"]],
@@ -24,78 +24,96 @@
 }
 
 fileToPrefix = {
-	'wav': 'Sound',
-	'ogg': 'Sound',
+    'wav': 'Sound',
+    'ogg': 'Sound',
     'mp3': 'Sound', ## Can't believe they forgot about the best sound format
-	'dmm': 'Mapping',
+    'dmm': 'Mapping',
 
-	'js': 'UI',
-	'tsx': 'UI',
-	'ts': 'UI',
-	'jsx': 'UI',
-	'scss': 'UI',
+    'js': 'UI',
+    'tsx': 'UI',
+    'ts': 'UI',
+    'jsx': 'UI',
+    'scss': 'UI',
 
-	'dmi': "Sprites",
+    'dmi': "Sprites",
 }
 
 githubLabel = "Github"
+missingLogLabel = "Missing Changelog"
 
 def get_labels(pr):
-	labels = {}
-
-	files = pr.get_files()
-	for file in files:
-		prefix = file.filename.split(".")[-1]
-		if file.filename.startswith(".github"):
-			labels[githubLabel] = True
-		if not prefix in fileToPrefix:
-			continue
-		labels[fileToPrefix[prefix]] = True
-
-	changelog_match = re.search(r"🆑(.*)/🆑", pr.body, re.S | re.M)
-	if changelog_match is None:
-		changelog_match = re.search(r":cl:(.*)/:cl:", pr.body, re.S | re.M)
-		if changelog_match is None:
-			return labels
-	lines = changelog_match.group(1).split('\n')
-	for line in lines:
-		line = line.strip()
-		if not line:
-			continue
-
-		contentSplit = line.split(":")
-
-		key = contentSplit.pop(0).strip()
-		content = ":".join(contentSplit).strip()
-
-		if not key in changelogToPrefix:
-			continue
-
-		if content in changelogToPrefix[key][1]:
-			continue
-
-		labels[changelogToPrefix[key][0]] = True
-
-	return list(labels)
+    labels = {}
+    failed = False
+
+    files = pr.get_files()
+    for file in files:
+        prefix = file.filename.split(".")[-1]
+        if file.filename.startswith(".github"):
+            labels[githubLabel] = True
+        if not prefix in fileToPrefix:
+            continue
+        labels[fileToPrefix[prefix]] = True
+
+    changelog_match = re.search(r"🆑(.*)/🆑", pr.body, re.S | re.M)
+    if changelog_match is None:
+        changelog_match = re.search(r":cl:(.*)/:cl:", pr.body, re.S | re.M)
+        if changelog_match is None:
+            print("::warning ::No changelog detected.")
+            labels[missingLogLabel] = True
+            return labels, False
+
+    lines = changelog_match.group(1).split('\n')
+    failed = len(lines) <= 2 # Make sure its not an empty changelog
+    if failed:
+        print("::error ::Empty changelog.")
+
+    for line in lines[1:-1]: # Skip first line with authors and last
+        line = line.strip()
+        if not line:
+            continue
+
+        contentSplit = line.split(":")
+
+        key = contentSplit.pop(0).strip()
+        content = ":".join(contentSplit).strip()
+
+        if not key in changelogToPrefix: # Some key that we didn't expect
+            print(f"::error ::Invalid changelog entry: {line}")
+            failed = True
+            continue
+
+        if content in changelogToPrefix[key][1]: # They left the template entry in
+            print(f"::error ::Invalid changelog entry: {line}")
+            failed = True
+            continue
+
+        labels[changelogToPrefix[key][0]] = True
+
+    return list(labels), failed
 
 def main():
-	g = Github(os.environ["TOKEN"])
-	repo = g.get_repo(os.environ['REPO'])
+    g = Github(os.environ["TOKEN"])
+    repo = g.get_repo(os.environ['REPO'])
 
-	pr = repo.get_pull(int(os.environ["PR_NUMBER"]))
-	if not pr:
-		print("Not a PR.")
-		return
+    pr = repo.get_pull(int(os.environ["PR_NUMBER"]))
+    if not pr:
+        print("::warning ::Not a PR.")
+        return
 
-	labels = get_labels(pr)
+    labels, failed = get_labels(pr)
 
-	if labels is None: # no labels to add
-		print("No labels to add.")
-		return
+    if not missingLogLabel in labels:
+        try:
+            pr.remove_from_labels(missingLogLabel)
+        except GithubException as e:
+            if e.status == 404:
+                pass # 404 if we try to remove a label that isn't set
 
-	for label in labels:
-		pr.add_to_labels(label)
+    for label in labels:
+        pr.add_to_labels(label)
 
+    if failed:
+        exit(1)
 
 if __name__ == '__main__':
-	main()
+    main()

.github/workflows/labeler.yml

@@ -1,7 +1,7 @@
-name: Labeling
+name: Labeling and Verification
 on:
   pull_request_target:
-    types: [opened]
+    types: [opened, edited]
 jobs:
   label:
     runs-on: ubuntu-latest
@@ -13,7 +13,7 @@ jobs:
         run: |
           unset SECRET_EXISTS
           if [ -n "$ENABLER_SECRET" ]; then SECRET_EXISTS=true ; fi
-          echo "::set-output name=ACTIONS_ENABLED::$SECRET_EXISTS"
+          echo "ACTIONS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
       - name: Get The Script
         if: steps.value_holder.outputs.ACTIONS_ENABLED
         run: |
@@ -29,7 +29,7 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install pygithub
           sudo apt-get install dos2unix
-      - name: Add Labels
+      - name: Add and verify labels
         if: steps.value_holder.outputs.ACTIONS_ENABLED
         run: |
           python add_labels.py

code/__DEFINES/dcs/signals/signals_global.dm

@@ -75,3 +75,6 @@
 
 #define COMSIG_GLOB_HIJACK_IMPACTED "!hijack_impacted"
 #define COMSIG_GLOB_HIJACK_LANDED "!hijack_landed"
+
+/// From /datum/controller/subsystem/hijack/fire()
+#define COMSIG_GLOB_FUEL_PUMP_UPDATE "!fuel_pump_update"

code/__DEFINES/equipment.dm

@@ -82,6 +82,8 @@
 #define ANIMATED_SURGICAL_TOOL (1<<12)
 /// Has heat source but isn't 'on fire' and thus can be stored
 #define IGNITING_ITEM (1<<13)
+/// Overrides NODROP in some cases (stripping)
+#define FORCEDROP_CONDITIONAL (1<<14)
 //==========================================================================================
 
 

code/__DEFINES/strippable.dm

@@ -0,0 +1,30 @@
+// All of these must be matched in StripMenu.js.
+#define STRIPPABLE_ITEM_HEAD "head"
+#define STRIPPABLE_ITEM_BACK "back"
+#define STRIPPABLE_ITEM_MASK "wear_mask"
+#define STRIPPABLE_ITEM_EYES "glasses"
+#define STRIPPABLE_ITEM_L_EAR "wear_l_ear"
+#define STRIPPABLE_ITEM_R_EAR "wear_r_ear"
+#define STRIPPABLE_ITEM_JUMPSUIT "w_uniform"
+#define STRIPPABLE_ITEM_SUIT "wear_suit"
+#define STRIPPABLE_ITEM_GLOVES "gloves"
+#define STRIPPABLE_ITEM_FEET "shoes"
+#define STRIPPABLE_ITEM_SUIT_STORAGE "j_store"
+#define STRIPPABLE_ITEM_ID "id"
+#define STRIPPABLE_ITEM_BELT "belt"
+#define STRIPPABLE_ITEM_LPOCKET "l_store"
+#define STRIPPABLE_ITEM_RPOCKET "r_store"
+#define STRIPPABLE_ITEM_LHAND "l_hand"
+#define STRIPPABLE_ITEM_RHAND "r_hand"
+#define STRIPPABLE_ITEM_HANDCUFFS "handcuffs"
+#define STRIPPABLE_ITEM_LEGCUFFS "legcuffs"
+
+
+/// This slot is not obscured.
+#define STRIPPABLE_OBSCURING_NONE 0
+
+/// This slot is completely obscured, and cannot be accessed.
+#define STRIPPABLE_OBSCURING_COMPLETELY 1
+
+/// This slot can't be seen, but can be accessed.
+#define STRIPPABLE_OBSCURING_HIDDEN 2

code/__HELPERS/_lists.dm

@@ -176,3 +176,4 @@
 
 	for(var/i in 1 to inserted_list.len - 1)
 		inserted_list.Swap(i, rand(i, inserted_list.len))
+

code/_macros.dm

@@ -67,6 +67,11 @@
 #define LAZYREMOVEASSOC(L, K, V) if(L) { if(L[K]) { L[K] -= V; if(!length(L[K])) L -= K; } if(!length(L)) L = null; }
 ///Accesses an associative list, returns null if nothing is found
 #define LAZYACCESSASSOC(L, I, K) L ? L[I] ? L[I][K] ? L[I][K] : null : null : null
+///Performs an insertion on the given lazy list with the given key and value. If the value already exists, a new one will not be made.
+#define LAZYORASSOCLIST(lazy_list, key, value) \
+	LAZYINITLIST(lazy_list); \
+	LAZYINITLIST(lazy_list[key]); \
+	lazy_list[key] |= value;
 
 // Insert an object A into a sorted list using cmp_proc (/code/_helpers/cmp.dm) for comparison.
 #define ADD_SORTED(list, A, cmp_proc) if(!list.len) {list.Add(A)} else {list.Insert(FindElementIndex(A, list, cmp_proc), A)}

code/_onclick/click_hold.dm

@@ -97,7 +97,6 @@
 
 /client/MouseDrop(datum/src_object, datum/over_object, src_location, over_location, src_control, over_control, params)
 	. = ..()
-
 	if(over_object)
 		SEND_SIGNAL(over_object, COMSIG_ATOM_DROPPED_ON, src_object, src)
 

code/_onclick/drag_drop.dm

@@ -7,6 +7,7 @@
 */
 /atom/MouseDrop(atom/over)
 	if(!usr || !over) return
+
 	if(!Adjacent(usr) || !over.Adjacent(usr)) return // should stop you from dragging through windows
 
 	spawn(0)

code/controllers/subsystem/hijack.dm

@@ -105,6 +105,7 @@ SUBSYSTEM_DEF(hijack)
 
 	if(hijack_status < HIJACK_OBJECTIVES_STARTED)
 		hijack_status = HIJACK_OBJECTIVES_STARTED
+		SEND_GLOBAL_SIGNAL(COMSIG_GLOB_FUEL_PUMP_UPDATE)
 
 	if(current_progress >= required_progress)
 		if(hijack_status < HIJACK_OBJECTIVES_COMPLETE)
@@ -157,6 +158,7 @@ SUBSYSTEM_DEF(hijack)
 	if(current_progress >= announce_checkpoint)
 		announce_progress()
 		announce_checkpoint += initial(announce_checkpoint)
+		SEND_GLOBAL_SIGNAL(COMSIG_GLOB_FUEL_PUMP_UPDATE)
 
 	current_run_progress_additive = 0
 	current_run_progress_multiplicative = 1