Merge branch 'dev' of https://github.com/HearthOfHestia/Nebula into n…

…eb-feature/inhalers

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,62 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+<!--
+	Anything inside tags like these is a comment and will not be displayed in the final issue.
+	Be careful not to write inside them!
+
+	Every field other than 'specific information for locating' is required.
+	If you do not fill out the 'specific information' field, please delete the header.
+	/!\ Omitting or not answering a required field will result in your issue being closed. /!\
+	Repeated violation of this rule, or joke or spam issues, will result in punishment.
+	
+	PUT YOUR ANSWERS ON THE BLANK LINES BELOW THE HEADERS 
+	(The lines with four #'s) 
+	Don't edit them or delete them - it's part of the formatting
+-->
+
+#### Description of issue
+
+
+
+#### Difference between expected and actual behavior
+
+
+
+#### Steps to reproduce
+
+
+
+#### Specific information for locating
+<!-- e.g. an object name, paste specific message outputs... -->
+
+
+
+#### Length of time in which bug has been known to occur
+<!--
+	Be specific if you approximately know the time it's been occurring
+	for—this can speed up finding the source. If you're not sure
+	about it, tell us too!
+-->
+
+
+
+#### Client version, Server revision & Game ID
+<!-- Found with the "Show server revision" verb in the OOC tab in game. -->
+
+
+
+#### Issue bingo
+<!-- Check these by writing an x inside the [ ] (like this: [x])-->
+<!-- Don't forget to remove the space between the brackets, or it won't work! -->
+- [ ] Issue could be reproduced at least once
+- [ ] Issue could be reproduced by different players
+- [ ] Issue could be reproduced in multiple rounds
+- [ ] Issue happened in a recent (less than 7 days ago) round
+- [ ] [Couldn't find an existing issue about this](https://github.com/HearthOfHestia/Nebula/issues)

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,41 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[FEATURE]"
+labels: enhancement
+assignees: ''
+
+---
+
+<!--
+	Anything inside tags like these is a comment and will not be displayed in the final issue.
+	Be careful not to write inside them!
+
+	Every field is required. If a field is not applicable, please explain why.
+	/!\ Omitting or not answering a required field will result in your issue being closed. /!\
+	Repeated violation of this rule, or joke or spam issues, will result in punishment.
+	
+	PUT YOUR ANSWERS ON THE BLANK LINES BELOW THE HEADERS 
+	(The lines with four #'s) 
+	Don't edit them or delete them - it's part of the formatting
+-->
+#### Is your feature request related to a problem? Please describe.
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+#### Describe the solution you'd like
+A clear and concise description of what you want to happen.
+
+#### Describe alternatives you've considered
+A clear and concise description of any alternative solutions or features you've considered.
+
+#### Additional context
+Add any other context or screenshots about the feature request here.
+
+#### Feature bingo
+<!-- Check these by writing an x inside the [ ] (like this: [x])-->
+<!-- Don't forget to remove the space between the brackets, or it won't work! -->
+- [ ] Feature does not already exist
+- [ ] Feature has not been rejected in the past 30 days
+- [ ] Feature has no maintainer vetos
+- [ ] Feature does not break the [Github Acceptable Use Policies on restricted content](https://docs.github.com/en/github/site-policy/github-acceptable-use-policies#2-content-restrictions)
+- [ ] [Couldn't find an existing feature request about this](https://github.com/HearthOfHestia/Nebula/labels/enhancement).

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,31 +1,26 @@
+<!-- !! PLEASE, READ THIS !! -->
 <!-- We recommend to check the contributing page before opening pull requests. -->
 <!-- https://github.com/NebulaSS13/Nebula/blob/dev/CONTRIBUTING.md -->
-
-<!-- !! PLEASE, READ THIS !! -->
 <!-- If you opening a pull request which changes A LOT icon/map files: -->
-<!-- Add [IDB IGNORE] (to ignore icon files diff) or [MDB IGNORE] (to ignore map files diff) in PR title. -->
+<!-- Add [IDB IGNORE] (to ignore icon files diff) or [MDB IGNORE] (to ignore map files diff) in the PR title. -->
 <!-- These tags created to prevent parsing a huge diffs and not overload IconDiffBot and MapDiffBot. -->
 
 ## Description of changes
-
 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! -->
 
 ## Why and what will this PR improve
-
 <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. -->
 
 ## Authorship
-
 <!-- Describe original authors of changes to credit them. -->
 
 ## Changelog
-
+<!-- Enter your value after first :cl: tag if you want to specify another name or several people. -->
 :cl:
 prefix:
 /:cl:
 
 <!-- Replace `prefix` with one of tags below. You can add more tags for multiple changelog entries.
-
 - bugfix
 - balance
 - tweak
@@ -39,5 +34,4 @@ prefix:
 - spellcheck
 - experiment
 - admin
-
 -->

.github/workflows/test.yml

@@ -15,8 +15,8 @@ on:
 
 env:
   BYOND_MAJOR: "514"
-  BYOND_MINOR: "1566"
-  SPACEMAN_DMM_VERSION: suite-1.7
+  BYOND_MINOR: "1572"
+  SPACEMAN_DMM_VERSION: suite-1.7.1
 
 jobs:
   DreamChecker:
@@ -80,7 +80,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        map_path: [example, tradeship, nexus, exodus, ministation, away_sites_testing, modpack_testing]
+        map_path: [example, tradeship, nexus, exodus, ministation, away_sites_testing, modpack_testing, torch]
     steps:
       - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
       - name: Setup Cache

code/__defines/directions.dm

@@ -16,6 +16,8 @@
 #define CORNER_EASTWEST         CORNER_COUNTERCLOCKWISE
 #define CORNER_NORTHSOUTH       CORNER_CLOCKWISE
 
+#define FIRST_DIR(X) ((X) & -(X))
+
 /*
 	turn() is weird:
 		turn(icon, angle) turns icon by angle degrees clockwise

code/__defines/flags.dm

@@ -46,7 +46,7 @@ The latter will result in a linter warning and will not work correctly.
 #define ATOM_FLAG_ADJACENT_EXCEPTION      BITFLAG(9)  // Skips adjacent checks for atoms that should always be reachable in window tiles
 #define ATOM_FLAG_NO_DISSOLVE             BITFLAG(10) // Bypasses solvent reactions in the container.
 #define ATOM_FLAG_NO_PHASE_CHANGE         BITFLAG(11) // Bypasses heating and cooling product reactions in the container.
-#define ATOM_FLAG_ALLOW_DIAGONAL_FACING   BITFLAG(12) // Atom can face non-cardinal directions.
+#define ATOM_FLAG_BLOCK_DIAGONAL_FACING   BITFLAG(12) // Atom cannot face non-cardinal directions.
 
 #define ATOM_IS_OPEN_CONTAINER(A)         (A.atom_flags & ATOM_FLAG_OPEN_CONTAINER)
 

code/__defines/misc.dm

@@ -261,11 +261,25 @@
 
 #define Z_ALL_TURFS(Z) block(locate(1, 1, Z), locate(world.maxx, world.maxy, Z))
 
-#if DM_BUILD < 1540
-#define AS_ANYTHING as()
-#else
 #define AS_ANYTHING as anything
-#endif
+
+// Cooking appliances.
+#define APPLIANCE_MIX         BITFLAG(0)
+#define APPLIANCE_FRYER       BITFLAG(1)
+#define APPLIANCE_OVEN        BITFLAG(2)
+#define APPLIANCE_SKILLET     BITFLAG(3)
+#define APPLIANCE_SAUCEPAN    BITFLAG(4)
+#define APPLIANCE_POT         BITFLAG(5)
+#define APPLIANCE_MICROWAVE   BITFLAG(6)
+// Cooking misc.
+// can_insert return values
+#define CANNOT_INSERT  0
+#define CAN_INSERT     1
+#define INSERT_GRABBED 2
+// check_contents return values
+#define CONTAINER_EMPTY  0
+#define CONTAINER_SINGLE 1
+#define CONTAINER_MANY   2
 
 //NOTE: INTENT_HOTKEY_* defines are not actual intents!
 //they are here to support hotkeys
@@ -286,3 +300,6 @@
 #define WRITTEN_SKIP     0
 #define WRITTEN_PHYSICAL 1
 #define WRITTEN_DIGITAL  2
+
+// arbitrary low pressure bound for wind weather effects
+#define MIN_WIND_PRESSURE 10

code/__defines/temperature.dm

@@ -3,11 +3,13 @@
 #define ATOM_TEMPERATURE_EQUILIBRIUM_CONSTANT 0.25
 
 #define ADJUST_ATOM_TEMPERATURE(_atom, _temp) \
-	_atom.temperature = _temp; \
-	if(_atom.reagents) { \
-		HANDLE_REACTIONS(_atom.reagents); \
-	} \
-	QUEUE_TEMPERATURE_ATOMS(_atom);
+	if(!QDELETED(_atom)) { \
+		_atom.temperature = _temp; \
+		if(!QDELETED(_atom.reagents)) { \
+			HANDLE_REACTIONS(_atom.reagents); \
+		} \
+		QUEUE_TEMPERATURE_ATOMS(_atom);\
+	}
 
 #define QUEUE_TEMPERATURE_ATOMS(_atoms) \
 	if(islist(_atoms)) { \

code/_global_vars/lists/flavor.dm

@@ -34,10 +34,10 @@ var/global/list/station_prefixes = list("", "Imperium", "Heretical", "Cuban",
 
 var/global/list/station_names = list("", "Stanford", "Dwarf", "Alien",
 	"Aegis", "Death-World", "Rogue", "Safety", "Paranoia",
-	"Explosive", "North", "West", "East", "South", "Slant-ways", 
-	"Widdershins", "Rimward", "Expensive", "Procreatory", "Imperial", 
-	"Unidentified", "Immoral", "Carp", "Orc", "Pete", "Control", 
-	"Nettle", "Class", "Crab", "Fist", "Corrogated", "Skeleton", 
+	"Explosive", "North", "West", "East", "South", "Slant-ways",
+	"Widdershins", "Rimward", "Expensive", "Procreatory", "Imperial",
+	"Unidentified", "Immoral", "Carp", "Orc", "Pete", "Control",
+	"Nettle", "Class", "Crab", "Fist", "Corrogated", "Skeleton",
 	"Gentleman", "Capitalist", "Communist", "Bear", "Beard", "Space",
 	"Star", "Moon", "System", "Mining", "Research", "Supply", "Military",
 	"Orbital", "Battle", "Science", "Asteroid", "Home", "Production",

code/_global_vars/lists/names.dm

@@ -1,3 +1,5 @@
+// All variables here use double quotes to able load information on every startup.
+
 var/global/list/ai_names =           file2list("config/names/ai.txt")
 var/global/list/wizard_first =       file2list("config/names/wizardfirst.txt")
 var/global/list/wizard_second =      file2list("config/names/wizardsecond.txt")
@@ -11,5 +13,3 @@ var/global/list/clown_names =        file2list("config/names/clown.txt")
 
 var/global/list/verbs =              file2list("config/names/verbs.txt")
 var/global/list/adjectives =         file2list("config/names/adjectives.txt")
-//loaded on startup because of "
-//would include in rsc if ' was used

code/_helpers/medical_scans.dm

@@ -265,7 +265,6 @@
 		if(E["is_stump"])
 			row += "<td><span class='bad'>Missing</span></td>"
 		else
-			row += "<td>"
 			var/rowdata = list()
 			if(E["brute_dam"] + E["burn_dam"] == 0)
 				rowdata += "None"
@@ -279,7 +278,7 @@
 					rowdata += "<span class='bad'>[capitalize(get_wound_severity(E["brute_ratio"], (E["limb_flags"] & ORGAN_FLAG_HEALS_OVERKILL)))] physical trauma</span>"
 				if(E["burn_dam"])
 					rowdata += "<span class='average'>[capitalize(get_wound_severity(E["burn_ratio"], (E["limb_flags"] & ORGAN_FLAG_HEALS_OVERKILL)))] burns</span>"
-			row += "</td><td>[jointext(rowdata, "<br>")]</td>"
+			row += "<td>[jointext(rowdata, "<br>")]</td>"
 
 		if(skill_level >= SKILL_ADEPT)
 			var/list/status = list()