Merge remote-tracking branch 'upstream/master'

.github/ISSUE_TEMPLATE/0-feature.yml

@@ -0,0 +1,29 @@
+name: "✨ New feature"
+description: Suggest an idea for this codebase
+title: "✨ <title>"
+type: 'feature'
+labels: ['Type: Feature/Suggestion']
+body:
+- type: textarea
+  attributes:
+    label: Brief description of the feature
+    description: "Please provide a clear and concise description of what the feature should be."
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: What you want to happen
+    description: "Please use as much detail as possible when describing the feature behavior, including any context that might be relevant."
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: Anything else you may wish to add
+    description: |
+      Location if it's a mapping issue, screenshots, sprites, etc.
+
+      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+  validations:
+    required: false

.github/ISSUE_TEMPLATE/1-bug_report.yml

@@ -0,0 +1,57 @@
+name: General Bug
+description: Create a report to help us improve
+title: '[GENERAL] <title>'
+type: 'bug'
+labels: 'Type: Bug'
+body:
+- type: textarea
+  attributes:
+    label: Brief description of the bug
+    description: "Please provide a clear and concise description of what the bug is."
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: What you expected to happen
+    description: "What normally happens when this occurs? Keep in mind that behavior may be different on other servers."
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: What actually happened
+    description: "Please use as much detail as possible when describing the bug behavior, including any context (things you did before) that might be relevant."
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: Reproduction steps
+    description: "How do you trigger this bug? Please walk us through it step by step."
+    value: |
+      1.
+      2.
+      3.
+      ...
+    render: bash
+  validations:
+    required: true
+
+- type: input
+  attributes:
+    label: Code Revision
+    description: "Found using the 'Show Server Revision' verb under the OOC tab."
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: Anything else you may wish to add
+    description: |
+      Location if it's a mapping issue, screenshots, sprites, etc.
+
+      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+  validations:
+    required: false
+

.github/ISSUE_TEMPLATE/2-ui_report.yml

@@ -0,0 +1,42 @@
+name: UI Bug
+description: File a bug report, specific to any UI related things.
+title: '[UI] <title>'
+labels: 'Type: Bug'
+type: 'bug'
+body:
+- type: textarea
+  attributes:
+    label: Brief description of the bug
+    description: "Please provide a clear and concise description of what the bug is."
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Reproduction steps
+    description: "How do you trigger this bug? Please walk us through it step by step."
+    value: |
+      1.
+      2.
+      3.
+      ...
+    render: bash
+  validations:
+    required: true
+
+- type: input
+  attributes:
+    label: Code Revision
+    description: "Found using the 'Show Server Revision' verb under the OOC tab."
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: Anything else you may wish to add
+    description: |
+      Location if it's a mapping issue, screenshots, sprites, etc.
+
+      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+  validations:
+    required: false

.github/ISSUE_TEMPLATE/3-map_report.yml

@@ -0,0 +1,56 @@
+name: Map Bug
+description: Create a report, specific to any map related things.
+title: '[MAPPING] <title>'
+type: 'bug'
+labels: ['Type: Bug', 'Type: Map']
+body:
+- type: textarea
+  attributes:
+    label: Brief description of the bug
+    description: "Please provide a clear and concise description of what the bug is."
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: What you expected to happen
+    description: "What normally happens when this occurs? Keep in mind that behavior may be different on other servers."
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: What actually happened
+    description: "Please use as much detail as possible when describing the bug behavior, including any context (things you did before) that might be relevant."
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: Reproduction steps
+    description: "How do you trigger this bug? Please walk us through it step by step."
+    value: |
+      1.
+      2.
+      3.
+      ...
+    render: bash
+  validations:
+    required: true
+
+- type: input
+  attributes:
+    label: Code Revision
+    description: "Found using the 'Show Server Revision' verb under the OOC tab."
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: Anything else you may wish to add
+    description: |
+      Location if it's a mapping issue, screenshots, sprites, etc.
+
+      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+  validations:
+    required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: true

ATTRIBUTIONS.md

@@ -98,3 +98,9 @@
 **Icon-States:** 'memorycrown', 'memorycrown_onmob'
 **Creator:** Sixberry<br>
 **License:** [CC BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)<br>
+<br>
+**Folder:** `icons/mob/robot/catborgs`<br>
+**Title:** Catborgs<br>
+**Creator / Copyright:** Toriate<br>
+**License Holders:** Matica, Cameron The Raven, Spotteh<br>
+**License:** [CC BY-NC-SA 3.0](https://creativecommons.org/licenses/by-nc-sa/3.0/)<br>

code/ATMOSPHERICS/components/trinary_devices/filter.dm

@@ -153,7 +153,7 @@
 	// 		<B>Flow rate: </B>[round(last_flow_rate, 0.1)]L/s
 	// 		"}
 
-	// user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmos_filter")
+	// user << browse("<html><HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT></html>", "window=atmos_filter")
 	// onclose(user, "atmos_filter")
 
 

code/ATMOSPHERICS/components/trinary_devices/mixer.dm

@@ -127,7 +127,7 @@
 	// 			<a href='byond://?src=\ref[src];node2_c=0.1'>+</a>
 	// 			"}
 
-	// user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_mixer")
+	// user << browse("<html><HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT></html>", "window=atmo_mixer")
 	// onclose(user, "atmo_mixer")
 	// return
 

code/ZAS/Variable Settings.dm

@@ -112,7 +112,7 @@ var/global/vs_control/vsc = new
 			if("[ch]_NAME" in vars) vw_name = vars["[ch]_NAME"]
 		dat += span_bold("[vw_name] = [vw]") + " <A href='byond://?src=\ref[src];[HrefToken()];changevar=[ch]'>\[Change\]</A><br>"
 		dat += "<i>[vw_desc]</i><br><br>"
-	user << browse(dat,"window=settings")
+	user << browse("<html>[dat]</html>","window=settings")
 
 /vs_control/Topic(href,href_list)
 	if("changevar" in href_list)

code/__defines/is_helpers.dm

@@ -38,6 +38,7 @@
 #define isnewplayer(A)	istype(A, /mob/new_player)
 
 #define isanimal(A)		istype(A, /mob/living/simple_mob)
+#define ispassive(A)	istype(A, /mob/living/simple_mob/animal/passive)
 #define ismouse(A)		istype(A, /mob/living/simple_mob/animal/passive/mouse)
 #define iscorgi(A)		istype(A, /mob/living/simple_mob/animal/passive/dog/corgi)
 #define isslime(A)		istype(A, /mob/living/simple_mob/slime)

code/__defines/span_vr.dm

@@ -72,7 +72,7 @@
 #define span_filter_combat(str) ("<span class='filter_combat'>" + str + "</span>")
 
 // Filtered under warning messages
-#define span_critical(str) ("<span class='critical'>" + str + "</span>")
+#define span_critical(str) ("<span class='critical'>" + str + "</span>") //This doesn't seem to work.
 #define span_userdanger(str) ("<span class='userdanger'>" + str + "</span>")
 #define span_warning(str) ("<span class='warning'>" + str + "</span>")
 #define span_warningplain(str) ("<span class='warningplain'>" + str + "</span>")