Merge branch 'master' into tac-refactor

# Conflicts:
#	code/modules/cm_aliens/structures/special/pylon_core.dm

.github/CODEOWNERS

@@ -24,9 +24,8 @@
 /tools/docker/ @Fira
 /Dockerfile @Fira
 
-# MorrowWolf
+# Zonespace
 
-/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @morrowwolf
-/code/modules/gear_presets/survivors.dm @morrowwolf
+/code/modules/gear_presets/survivors.dm @zonespace27
 
 # MULTIPLE OWNERS

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -10,6 +10,12 @@ body:
       placeholder: "#1, #2, #3, etc"
     validations:
       required: true
+  - type: input
+    id: round-id
+    attributes:
+      label: Round ID
+      description: If known, what was the Round ID this bug was found on? Can be left blank if unknown or occured across multiple rounds.
+      placeholder: "12345"
   - type: textarea
     id: what-happened
     attributes:

.github/workflows/ci_suite.yml

@@ -60,6 +60,34 @@ jobs:
         with:
           outputFile: output-annotations.txt
 
+
+  odlint:
+    name: Lint with OpenDream
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+      - name: Get OpenDream Version
+        run: |
+          source dependencies.sh
+          echo "OPENDREAM_VERSION=$OPENDREAM_VERSION" >> $GITHUB_ENV
+      - name: Restore OpenDream cache
+        uses: actions/cache@v3
+        id: cache-od
+        with:
+          path: ~/OpenDream
+          key: ${{ runner.os }}-opendream-${{ env.OPENDREAM_VERSION }}
+      - name: Download OpenDream
+        if: steps.cache-od.outputs.cache-hit != 'true'
+        run: |
+          bash tools/ci/download_od.sh
+      - name: Setup OpenDream
+        if: steps.cache-od.outputs.cache-hit != 'true'
+        run: |
+          bash tools/ci/setup_od.sh
+      - name: Run OpenDream
+        run: |
+          bash tools/ci/run_od.sh
+
   compile_all_maps:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Compile Maps

.gitignore

@@ -31,3 +31,6 @@ test_environment.txt
 # byond-tracy backend, not shipped with the codebase so it shouldn't be maintained
 prof.dll
 libprof.so
+
+# OpenDream compatibility stuff
+colonialmarines.json

code/__DEFINES/__game.dm

@@ -283,7 +283,6 @@ block( \
 /// Only use the CEILING_PROTECTION_TIER_X defines for `protection_level`
 #define CEILING_IS_PROTECTED(ceiling, protection_level) (ceiling >= protection_level)
 
-
 // Default font settings
 #define FONT_SIZE "5pt"
 #define DEFAULT_FONT_COLOR "#09f"
@@ -493,6 +492,18 @@ block( \
 #define TURF_PROTECTION_CAS 2
 #define TURF_PROTECTION_OB 3
 
+/// Convert a turf protection level to a ceiling protection level
+/proc/get_ceiling_protection_level(turf_protection_level)
+	switch(turf_protection_level)
+		if(TURF_PROTECTION_OB)
+			return CEILING_PROTECTION_TIER_4
+		if(TURF_PROTECTION_CAS)
+			return CEILING_PROTECTION_TIER_3
+		if(TURF_PROTECTION_MORTAR)
+			return CEILING_PROTECTION_TIER_2
+		else
+			return CEILING_NO_PROTECTION
+
 // Anything above the deck boundary is the upper deck, anything below is the lower deck
 // This is exclusive, so anything ON the boundary is an edge case that's neither on the upper nor the lower deck
 #define ALMAYER_DECK_BOUNDARY 101

code/__DEFINES/atmospherics.dm

@@ -23,6 +23,8 @@
 
 #define T0C 273.15 // 0degC
 #define T20C 293.15 // 20degC
+#define T90C 363.15 // 90degC
+#define T120C 393.15 // 120degC
 #define TCMB 2.7 // -270.3degC
 #define ICE_COLONY_TEMPERATURE 223 //-50degC
 #define SOROKYNE_TEMPERATURE 223 // Same as Ice for now

code/__DEFINES/bullet_traits.dm

@@ -3,7 +3,7 @@
 // list of args if there are any args
 /// An entry to a list for giving projectiles bullet traits
 /// Must be placed inside of a list
-#define BULLET_TRAIT_ENTRY(trait, args...) trait = #args ? list(##args) : null
+#define BULLET_TRAIT_ENTRY(trait, args...) trait = list(##args)
 /// An entry to a list for giving projectiles bullet traits with a unique ID
 /// Must be placed inside of a list
 #define BULLET_TRAIT_ENTRY_ID(id, trait, args...) id = list(trait, ##args)

code/__DEFINES/dcs/signals/atom/mob/living/signals_human.dm

@@ -36,6 +36,10 @@
 #define COMSIG_HUMAN_UPDATE_SIGHT "human_update_sight"
 	#define COMPONENT_OVERRIDE_UPDATE_SIGHT (1<<0)
 
+///from /mob/living/carbon/human/movement_delay()
+#define COMSIG_HUMAN_MOVEMENT_CANCEL_INTERACTION "human_movement_cancel_interaction"
+	#define COMPONENT_HUMAN_MOVEMENT_KEEP_USING (1<<0)
+
 ///from /mob/living/carbon/human/update_sight()
 #define COMSIG_HUMAN_POST_UPDATE_SIGHT "human_post_update_sight"
 ///from /mob/living/carbon/human/movement_delay(): (list/movedata)

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

@@ -45,3 +45,9 @@
 
 ///When the transform or an atom is varedited through vv topic.
 #define COMSIG_ATOM_VV_MODIFY_TRANSFORM "atom_vv_modify_transform"
+
+/// Called when an atom has something mouse dropped on it, from /client/MouseDrop: (atom/dropped_on)
+#define COMSIG_ATOM_DROPPED_ON "atom_dropped_on"
+
+/// Called when an atom is mouse dropped on another atom, from /client/MouseDrop: (atom/dropped_onto)
+#define COMSIG_ATOM_DROP_ON "atom_drop_on"

code/__DEFINES/dcs/signals/atom/signals_item.dm

@@ -65,3 +65,6 @@
 
 /// from  /obj/item/weapon/gun/proc/load_into_chamber() : ()
 #define COMSIG_GUN_INTERRUPT_FIRE "gun_interrupt_fire"
+
+//Additional procs on items that will be triggered right after the human finishes spawns in
+#define COMSIG_POST_SPAWN_UPDATE "post_spawn_update"

code/__DEFINES/dcs/signals/signals_global.dm

@@ -60,8 +60,11 @@
 #define COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING "!groundside_forsaken_handling"
 
 /// From
-#define COMSIG_GLOB_YAUTJA_ARMORY_OPENED "yautja_armory_opened"
+#define COMSIG_GLOB_YAUTJA_ARMORY_OPENED "!yautja_armory_opened"
 
 /// From /proc/biohazard_lockdown()
-#define COMSIG_GLOB_RESEARCH_LOCKDOWN "research_lockdown_closed"
-#define COMSIG_GLOB_RESEARCH_LIFT "research_lockdown_opened"
+#define COMSIG_GLOB_RESEARCH_LOCKDOWN "!research_lockdown_closed"
+#define COMSIG_GLOB_RESEARCH_LIFT "!research_lockdown_opened"
+
+/// From /obj/structure/machinery/power/fusion_engine/proc/set_overloading() : (set_overloading)
+#define COMSIG_GLOB_GENERATOR_SET_OVERLOADING "!generator_set_overloading"

code/__DEFINES/hijack.dm

@@ -0,0 +1,13 @@
+#define EVACUATION_TYPE_NONE 0
+#define EVACUATION_TYPE_ADDITIVE 1
+#define EVACUATION_TYPE_MULTIPLICATIVE 2
+
+#define HIJACK_ANNOUNCE "ARES Emergency Procedures"
+#define XENO_HIJACK_ANNOUNCE "You sense something unusual..."
+
+#define EVACUATION_STATUS_NOT_INITIATED 0
+#define EVACUATION_STATUS_INITIATED 1
+
+#define HIJACK_OBJECTIVES_NOT_STARTED 0
+#define HIJACK_OBJECTIVES_STARTED 1
+#define HIJACK_OBJECTIVES_COMPLETE 2

code/__DEFINES/job.dm

@@ -267,6 +267,7 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 #define JOB_UPP_GENERAL "UPP Army General"
 
 #define JOB_UPP_COMBAT_SYNTH "UPP Combat Synthetic"
+#define JOB_UPP_SUPPORT_SYNTH "UPP Support Synthetic"
 
 #define UPP_JOB_LIST list(JOB_UPP, JOB_UPP_ENGI, JOB_UPP_MEDIC, JOB_UPP_SPECIALIST, JOB_UPP_LEADER, JOB_UPP_POLICE, JOB_UPP_LT_OFFICER, JOB_UPP_LT_DOKTOR, JOB_UPP_SRLT_OFFICER, JOB_UPP_KPT_OFFICER, JOB_UPP_KOL_OFFICER, JOB_UPP_COMBAT_SYNTH)
 #define UPP_JOB_GRUNT_LIST list(JOB_UPP, JOB_UPP_ENGI, JOB_UPP_MEDIC, JOB_UPP_SPECIALIST, JOB_UPP_LEADER, JOB_UPP_POLICE, JOB_UPP_CREWMAN)

code/__DEFINES/keybinding.dm

@@ -87,6 +87,7 @@
 #define COMSIG_KB_HUMAN_WEAPON_UNLOAD "keybinding_human_weapon_unload"
 #define COMSIG_KB_HUMAN_WEAPON_ATTACHMENT "keybinding_human_weapon_attachment"
 #define COMSIG_KB_HUMAN_WEAPON_ATTACHMENT_RAIL "keybinding_human_weapon_attachment_rail"
+#define COMSIG_KB_HUMAN_WEAPON_SHOTGUN_TUBE "keybinding_human_weapon_shotgun_tube"
 
 #define COMSIG_KB_HUMAN_WEAPON_TOGGLE_IFF "keybinding_human_weapon_toggle_iff"
 

code/__DEFINES/mobs.dm

@@ -417,3 +417,4 @@ var/list/default_xeno_onmob_icons = list(
 #define HANDLING_LIMBS list("l_arm","l_hand", "r_arm", "r_hand")
 #define EXTREMITY_LIMBS list("l_leg","l_foot","r_leg","r_foot","l_arm","l_hand","r_arm","r_hand")
 #define CORE_LIMBS list("chest","head","groin")
+

code/__DEFINES/shuttles.dm

@@ -100,10 +100,12 @@
 #define MOBILE_SHUTTLE_ID_ERT_BIG "ert_boarding_shuttle"
 
 #define MOBILE_TRIJENT_ELEVATOR "trijentshuttle2"
-#define STAT_TRIJENT_LZ1 "trigent_lz1"
-#define STAT_TRIJENT_LZ2 "trigent_lz2"
-#define STAT_TRIJENT_ENGI "trigent_engineering"
-#define STAT_TRIJENT_OMEGA "trigent_omega"
+#define STAT_TRIJENT_EMPTY "trijent_empty"
+#define STAT_TRIJENT_OCCUPIED "trijent_occupied"
+#define STAT_TRIJENT_LZ1 "trijent_lz1"
+#define STAT_TRIJENT_LZ2 "trijent_lz2"
+#define STAT_TRIJENT_ENGI "trijent_engineering"
+#define STAT_TRIJENT_OMEGA "trijent_omega"
 
 #define MOBILE_SHUTTLE_LIFEBOAT_PORT "lifeboat-port"
 #define MOBILE_SHUTTLE_LIFEBOAT_STARBOARD "lifeboat-starboard"
@@ -115,6 +117,7 @@
 #define ALMAYER_DROPSHIP_LZ1 "almayer-hangar-lz1"
 #define ALMAYER_DROPSHIP_LZ2 "almayer-hangar-lz2"
 
+#define DROPSHIP_FLYBY_ID "special_flight"
 #define DROPSHIP_LZ1 "dropship-lz1"
 #define DROPSHIP_LZ2 "dropship-lz2"
 

code/__DEFINES/subsystems.dm

@@ -109,36 +109,23 @@
 // Subsystems shutdown in the reverse of the order they initialize in
 // The numbers just define the ordering, they are meaningless otherwise.
 
-#define SS_INIT_TICKER_SPAWN    999
 #define SS_INIT_INPUT   85
-#define SS_INIT_FAIL_TO_TOPIC 84
 #define SS_INIT_TOPIC 83
 #define SS_INIT_LOBBYART 82
-#define SS_INIT_RUST    30
 #define SS_INIT_INFLUXDRIVER 28
-#define SS_INIT_SUPPLY_SHUTTLE  25
 #define SS_INIT_GARBAGE 24
 #define SS_INIT_EVENTS 23.5
-#define SS_INIT_JOB 23
+#define SS_INIT_HIJACK 22.6
 #define SS_INIT_REDIS 22.5
 #define SS_INIT_REAGENTS 22.1
 #define SS_INIT_MAPPING 22
 #define SS_INIT_NIGHTMARE   21.5
 #define SS_INIT_TIMETRACK 21.1
 #define SS_INIT_HUMANS  21
-#define SS_INIT_MAP 20
-#define SS_INIT_COMPONENT   19.5
 #define SS_INIT_POWER   19
-#define SS_INIT_OBJECT  18
-#define SS_INIT_PIPENET 17.5
-#define SS_INIT_XENOARCH    17
-#define SS_INIT_MORE_INIT   16
-#define SS_INIT_AIR 15
-#define SS_INIT_TELEPORTER  13
 #define SS_INIT_INFLUXMCSTATS 12
 #define SS_INIT_INFLUXSTATS 11
 #define SS_INIT_LIGHTING 10
-#define SS_INIT_DEFCON 9
 #define SS_INIT_LAW 6
 #define SS_INIT_FZ_TRANSITIONS 5
 #define SS_INIT_PROJECTILES 4.1
@@ -152,12 +139,9 @@
 #define SS_INIT_RADIO 2
 #define SS_INIT_TIMER   100
 #define SS_INIT_UNSPECIFIED 0
-#define SS_INIT_EMERGENCY_SHUTTLE -19
 #define SS_INIT_ASSETS -20
 #define SS_INIT_TICKER -21
 #define SS_INIT_VOTE   -23
-#define SS_INIT_FINISH -24
-#define SS_INIT_ADMIN  -26
 #define SS_INIT_DATABASE   -27
 #define SS_INIT_ENTITYMANAGER   -28
 #define SS_INIT_PLAYTIME   -29
@@ -166,7 +150,6 @@
 #define SS_INIT_MINIMAP    -34
 #define SS_INIT_STATPANELS -98
 #define SS_INIT_CHAT    -100 //Should be last to ensure chat remains smooth during init.
-#define SS_INIT_EARLYRUNTIMES -500 // Post-init notifier
 
 // Subsystem fire priority, from lowest to highest priority
 // If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child)
@@ -177,7 +160,6 @@
 #define SS_PRIORITY_SOUND   250
 #define SS_PRIORITY_TICKER  200
 #define SS_PRIORITY_NIGHTMARE   180
-#define SS_PRIORITY_MAPVIEW    170
 #define SS_PRIORITY_QUADTREE    160
 #define SS_PRIORITY_CHAT    155
 #define SS_PRIORITY_STATPANEL    154
@@ -195,20 +177,17 @@
 #define SS_PRIORITY_VOTE    110
 #define SS_PRIORITY_FAST_OBJECTS   105
 #define SS_PRIORITY_OBJECTS 104
-#define SS_PRIORITY_FACEHUGGERS 100
 #define SS_PRIORITY_DECORATOR    99
+#define SS_PRIORITY_HIJACK 97
 #define SS_PRIORITY_POWER   95
 #define SS_PRIORITY_EFFECTS 92
 #define SS_PRIORITY_MACHINERY   90
 #define SS_PRIORITY_FZ_TRANSITIONS 88
-#define SS_PRIORITY_PIPENET 85
 #define SS_PRIORITY_ROUND_RECORDING 83
 #define SS_PRIORITY_SHUTTLE 80
-#define SS_PRIORITY_TELEPORTER  75
 #define SS_PRIORITY_EVENT   65
 #define SS_PRIORITY_DISEASE 60
-#define SS_PRIORITY_FAST_MACHINERY 55
-#define SS_PRIORITY_MIDI    40
+#define SS_PRIORITY_DEFENSES 55
 #define SS_PRIORITY_ENTITY    37
 #define SS_PRIORITY_DEFCON  35
 #define SS_PRIORITY_ACID_PILLAR    34
@@ -227,7 +206,6 @@
 #define SS_PRIORITY_INFLUXSTATS 8
 #define SS_PRIORITY_PLAYTIME    5
 #define SS_PRIORITY_PERFLOGGING 4
-#define SS_PRIORITY_CORPSESPAWNER  3
 #define SS_PRIORITY_GARBAGE 2
 #define SS_PRIORITY_INACTIVITY  1
 #define SS_PRIORITY_ADMIN   0

code/__DEFINES/surgery.dm

@@ -149,7 +149,7 @@ See also /datum/surgery_step/saw_off_limb/failure var/list/cannot_hack, listing
 #define SURGERY_TOOLS_SEVER_BONE list(\
 	/obj/item/tool/surgery/circular_saw = SURGERY_TOOL_MULT_IDEAL,\
 	/obj/item/weapon/twohanded/fireaxe = SURGERY_TOOL_MULT_SUBOPTIMAL,\
-	/obj/item/weapon/claymore/mercsword/machete = SURGERY_TOOL_MULT_SUBOPTIMAL,\
+	/obj/item/weapon/sword/machete = SURGERY_TOOL_MULT_SUBOPTIMAL,\
 	/obj/item/tool/hatchet = SURGERY_TOOL_MULT_SUBSTITUTE,\
 	/obj/item/tool/kitchen/knife/butcher = SURGERY_TOOL_MULT_SUBSTITUTE,\
 	/obj/item/attachable/bayonet = SURGERY_TOOL_MULT_BAD_SUBSTITUTE\

code/__DEFINES/tgs.dm

@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "6.5.3"
+#define TGS_DMAPI_VERSION "6.6.2"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 
@@ -129,6 +129,13 @@
 /// DreamDaemon Ultrasafe security level.
 #define TGS_SECURITY_ULTRASAFE 2
 
+/// DreamDaemon public visibility level.
+#define TGS_VISIBILITY_PUBLIC 0
+/// DreamDaemon private visibility level.
+#define TGS_VISIBILITY_PRIVATE 1
+/// DreamDaemon invisible visibility level.
+#define TGS_VISIBILITY_INVISIBLE 2
+
 //REQUIRED HOOKS
 
 /**
@@ -458,6 +465,10 @@
 /world/proc/TgsSecurityLevel()
 	return
 
+/// Returns the current BYOND visibility level as a TGS_VISIBILITY_ define if TGS is present, null otherwise. Requires TGS to be using interop API version 5 or higher otherwise the string "___unimplemented" wil be returned. This function may sleep if the call to [/world/proc/TgsNew] is sleeping!
+/world/proc/TgsVisibility()
+	return
+
 /// Returns a list of active [/datum/tgs_revision_information/test_merge]s if TGS is present, null otherwise. This function may sleep if the call to [/world/proc/TgsNew] is sleeping!
 /world/proc/TgsTestMerges()
 	return

code/__DEFINES/traits.dm

@@ -221,6 +221,9 @@
 /// Can lockout blackmarket from ASRS console circuits.
 #define TRAIT_TOOL_TRADEBAND "t_tool_tradeband"
 
+/// Can hack ASRS consoles to access the black market
+#define TRAIT_TOOL_BLACKMARKET_HACKER "t_tool_blackmarket_hacker"
+
 // CLOTHING TRAITS
 #define TRAIT_CLOTHING_HOOD "t_clothing_hood"
 

code/__DEFINES/urls.dm

@@ -1,3 +1,7 @@
+// placeholder strings to be replaced
+#define WIKI_PLACEHOLDER "%WIKIURL%"
+#define LAW_PLACEHOLDER "%LAWURL%"
+
 // ------ MISC WIKI LINKS ------ //
 #define URL_WIKI_LAW "Marine_Law"
 #define URL_WIKI_XENO_QUICKSTART "Xeno_Quickstart_Guide"