Merge branch 'master' of https://github.com/Zonespace27/cmss13 into t…

…utorial-system

.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/assert.dm

@@ -0,0 +1,13 @@
+#undef ASSERT
+
+/// Override BYOND's native ASSERT to optionally specify a message
+#define ASSERT(condition, message...) \
+	if (!(condition)) { \
+		CRASH(assertion_message(__FILE__, __LINE__, #condition, ##message)) \
+	}
+
+/proc/assertion_message(file, line, condition, message)
+	if (!isnull(message))
+		message = " - [message]"
+
+	return "[file]:[line]:Assertion failed: [condition][message]"

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/client_prefs.dm

@@ -1,6 +1,7 @@
 #define BE_ALIEN_AFTER_DEATH (1<<0)
 #define BE_AGENT (1<<1)
 
+//toggle_prefs bits from /datum/preferences
 #define TOGGLE_IGNORE_SELF (1<<0) // Determines whether you will not hurt yourself when clicking yourself
 #define TOGGLE_HELP_INTENT_SAFETY (1<<1) // Determines whether help intent will be completely harmless
 #define TOGGLE_MIDDLE_MOUSE_CLICK (1<<2) // This toggles whether selected ability for xeno uses middle mouse clicking or shift clicking
@@ -13,7 +14,7 @@
 												   // and put the empty magazine in your hand
 #define TOGGLE_AUTOMATIC_PUNCTUATION (1<<7) // Whether your sentences will automatically be punctuated with a period
 #define TOGGLE_COMBAT_CLICKDRAG_OVERRIDE (1<<8) // Whether disarm/harm intents cause clicks to trigger immediately when the mouse button is depressed.
-#define TOGGLE_ALTERNATING_DUAL_WIELD (1<<9) // Whether dual-wielding fires both guns at once or swaps between them.
+#define TOGGLE_ALTERNATING_DUAL_WIELD (1<<9) // Whether dual-wielding fires both guns at once or swaps between them, OUTDATED, used to update savefiles, now dual_wield_pref
 #define TOGGLE_FULLSCREEN (1<<10) // See /client/proc/toggle_fullscreen in client_procs.dm
 #define TOGGLE_MEMBER_PUBLIC (1<<11) //determines if you get a byond logo by your name in ooc if you're a member or not
 #define TOGGLE_OOC_FLAG (1<<12) // determines if your country flag appears by your name in ooc chat
@@ -32,3 +33,11 @@
 #define AGE_MIN 19 //youngest a character can be
 #define AGE_MAX 90 //oldest a character can be //no. you are not allowed to be 160.
 #define MAX_GEAR_COST 7 //Used in chargen for loadout limit.
+
+///dual_wield_pref from /datum/preferences
+///Fire both weapons when dual wielding
+#define DUAL_WIELD_FIRE 0
+///Swap to the other weapon when dual wielding
+#define DUAL_WIELD_SWAP 1
+///Do nothing when dual wielding
+#define DUAL_WIELD_NONE 2

code/__DEFINES/conflict.dm

@@ -109,6 +109,7 @@
 #define SHOES_SLOWDOWN -1
 
 #define SLOWDOWN_ARMOR_NONE 0
+#define SLOWDOWN_ARMOR_SUPER_LIGHT 0.10
 #define SLOWDOWN_ARMOR_VERY_LIGHT 0.20
 #define SLOWDOWN_ARMOR_LIGHT 0.35
 #define SLOWDOWN_ARMOR_MEDIUM 0.55

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/mob/signals_mob.dm

@@ -1,3 +1,5 @@
+///from base of mob/set_stat(): (new_stat, old_stat)
+#define COMSIG_MOB_STATCHANGE "mob_statchange"
 /// From /obj/structure/machinery/door/airlock/proc/take_damage
 #define COMSIG_MOB_DESTROY_AIRLOCK "mob_destroy_airlock"
 
@@ -167,3 +169,6 @@
 /// From /obj/item/grab/proc/progress_passive() : (mob/living/carbon/human/grabber)
 #define COMSIG_MOB_AGGRESSIVELY_GRABBED "mob_aggressively_grabbed"
 	#define COMSIG_MOB_AGGRESIVE_GRAB_CANCEL (1<<0)
+
+/// Cancels all running cloaking effects on target
+#define COMSIG_MOB_EFFECT_CLOAK_CANCEL "mob_effect_cloak_cancel"

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

@@ -45,3 +45,12 @@
 
 ///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"
+
+/// Called when an atom has emp_act called on it, from /atom/emp_act: (severity)
+#define COMSIG_ATOM_EMP_ACT "atom_emp_act"

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

@@ -0,0 +1,26 @@
+/// (charge_amount)
+#define COMSIG_CELL_USE_CHARGE "cell_use_charge"
+	#define COMPONENT_CELL_NO_USE_CHARGE (1<<0)
+
+/// (charge_amount)
+#define COMSIG_CELL_ADD_CHARGE "cell_add_charge"
+
+#define COMSIG_CELL_START_TICK_DRAIN "cell_start_tick_drain"
+
+#define COMSIG_CELL_STOP_TICK_DRAIN "cell_stop_tick_drain"
+
+/// (mob/living/user)
+#define COMSIG_CELL_TRY_RECHARGING "cell_try_recharging"
+	#define COMPONENT_CELL_NO_RECHARGE (1<<0)
+
+#define COMSIG_CELL_OUT_OF_CHARGE "cell_out_of_charge"
+
+/// (charge_amount)
+#define COMSIG_CELL_CHECK_CHARGE "cell_check_charge"
+	#define COMPONENT_CELL_CHARGE_INSUFFICIENT (1<<0)
+
+#define COMSIG_CELL_TRY_INSERT_CELL "cell_try_insert_cell"
+	#define COMPONENT_CANCEL_CELL_INSERT (1<<0)
+
+/// (mob/living/user)
+#define COMSIG_CELL_REMOVE_CELL "cell_remove_cell"

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"
+
+//from /datum/authority/branch/role/proc/equip_role()
+#define COMSIG_POST_SPAWN_UPDATE "post_spawn_update"

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

@@ -38,3 +38,5 @@
 
 /// from /obj/limb/proc/remove_all_bleeding() : (external, internal)
 #define COMSIG_LIMB_STOP_BLEEDING "limb_stop_bleeding"
+
+#define COMSIG_STRUCTURE_CRATE_SQUAD_LAUNCHED "structure_crate_squad_launched"

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/emote_panels.dm

@@ -6,7 +6,8 @@
 #define JOE_EMOTE_CATEGORY_WARNING "Warning"
 #define JOE_EMOTE_CATEGORY_QUESTION "Question"
 #define JOE_EMOTE_CATEGORY_NOTICE "Notice"
-
+#define JOE_EMOTE_CATEGORY_FIRE "Fire"
+#define JOE_EMOTE_CATEGORY_DAMAGE "Damage"
 #define YAUTJA_EMOTE_CATEGORY_FAKESOUND "Fake Sound"
 #define YAUTJA_EMOTE_CATEGORY_VOICE "Voice Synthesizer"
 #define YAUTJA_EMOTE_CATEGORY_SPECIES "Yautja"

code/__DEFINES/equipment.dm

@@ -80,10 +80,8 @@
 #define CAN_DIG_SHRAPNEL (1<<11)
 /// whether it has an animated icon state of "[icon_state]_on" to be used during surgeries.
 #define ANIMATED_SURGICAL_TOOL (1<<12)
-/// The item goes on top of tables, instead of into them with the overlay system
-#define NOTABLEMERGE (1<<13)
 /// Has heat source but isn't 'on fire' and thus can be stored
-#define IGNITING_ITEM (1<<14)
+#define IGNITING_ITEM (1<<13)
 //==========================================================================================
 
 
@@ -551,3 +549,8 @@ var/global/list/uniform_categories = list(
 #define PHONE_MARINE "Marine"
 #define PHONE_UPP_SOLDIER "Soldier"
 #define PHONE_IO "IO"
+
+#define PHONE_DND_FORCED 2
+#define PHONE_DND_ON 1
+#define PHONE_DND_OFF 0
+#define PHONE_DND_FORBIDDEN -1

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

@@ -11,6 +11,7 @@
 #define SQUAD_MARINE_CRYO "Foxtrot"
 #define SQUAD_MARINE_INTEL "Intel"
 #define SQUAD_SOF "SOF"
+#define SQUAD_CBRN "CBRN"
 
 // Job name defines
 #define JOB_SQUAD_MARINE "Rifleman"
@@ -267,6 +268,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

@@ -14,6 +14,7 @@
 #define COMSIG_KB_ADMIN_INVISIMINTOGGLE_DOWN "keybinding_admin_invisimintoggle_down"
 #define COMSIG_KB_ADMIN_DEADMIN_DOWN "keybinding_admin_deadmin_down"
 #define COMSIG_KB_ADMIN_READMIN_DOWN "keybinding_admin_readmin_down"
+#define COMSIG_KB_ADMIN_MENTORSAY_DOWN "keybinding_admin_mentorsay_down"
 
 //Carbon
 #define COMSIG_KB_CARBON_HOLDRUNMOVEINTENT_DOWN "keybinding_carbon_holdrunmoveintent_down"
@@ -43,12 +44,6 @@
 #define COMSIG_KG_CLIENT_RADIO_DOWN "keybinding_client_radio_down"
 
 //Human
-#define COMSIG_KB_HUMAN_QUICKEQUIP_DOWN "keybinding_human_quickequip_down"
-#define COMSIG_KB_HUMAN_SECONDARY_DOWN "keybinding_human_secondary_down"
-#define COMSIG_KB_HUMAN_TERTIARY_DOWN "keybinding_human_tertiary_down"
-#define COMSIG_KB_HUMAN_QUATERNARY_DOWN "keybinding_human_quaternary_down"
-#define COMSIG_KB_HUMAN_QUICK_EQUIP_DOWN "keybinding_human_quick_equip_down"
-
 #define COMSIG_KB_HUMAN_ISSUE_ORDER "keybinding_human_issue_order"
 #define COMSIG_KB_HUMAN_ISSUE_ORDER_MOVE "keybinding_human_issue_order_move"
 #define COMSIG_KB_HUMAN_ISSUE_ORDER_HOLD "keybinding_human_issue_order_hold"
@@ -57,12 +52,31 @@
 #define COMSIG_KB_HUMAN_SPECIALIST_ACTIVATION_ONE "keybinding_human_specialist_activation_one"
 #define COMSIG_KB_HUMAN_SPECIALIST_ACTIVATION_TWO "keybinding_human_specialist_activation_two"
 
-#define COMSIG_KB_HUMAN_PICK_UP "keybinding_human_pick_up"
-
 #define COMSIG_KB_HUMAN_ROTATE_CHAIR "keybinding_human_rotate_chair"
 
 #define COMSIG_KB_HUMAN_SHOW_HELD_ITEM "keybinding_human_show_held_item"
 
+#define COMSIG_KB_HUMAN_CYCLE_HELMET_HUD "keybinding_human_cycle_helmet_hud"
+
+// Human Inventory Navigation
+#define COMSIG_KB_HUMAN_INTERACT_OTHER_HAND "keybinding_human_interact_other_hand"
+#define COMSIG_KB_HUMAN_INTERACT_SLOT_BACK "keybinding_human_interact_slot_back"
+#define COMSIG_KB_HUMAN_INTERACT_SLOT_BELT "keybinding_human_interact_slot_belt"
+#define COMSIG_KB_HUMAN_INTERACT_SLOT_UNIFORM "keybinding_human_interact_slot_uniform"
+#define COMSIG_KB_HUMAN_INTERACT_SLOT_SUIT "keybinding_human_interact_slot_suit"
+#define COMSIG_KB_HUMAN_INTERACT_SLOT_HELMET "keybinding_human_interact_slot_helmet"
+#define COMSIG_KB_HUMAN_INTERACT_SLOT_LEFT_POUCH "keybinding_human_interact_slot_left_pouch"
+#define COMSIG_KB_HUMAN_INTERACT_SLOT_RIGHT_POUCH "keybinding_human_interact_slot_right_pouch"
+#define COMSIG_KB_HUMAN_INTERACT_SUIT_S_STORE "keybinding_human_interact_slot_suit_storage"
+
+#define COMSIG_KB_HUMAN_INTERACT_QUICKEQUIP_DOWN "keybinding_human_interact_quickequip_down"
+#define COMSIG_KB_HUMAN_INTERACT_SECONDARY_DOWN "keybinding_human_interact_secondary_down"
+#define COMSIG_KB_HUMAN_INTERACT_TERTIARY_DOWN "keybinding_human_interact_tertiary_down"
+#define COMSIG_KB_HUMAN_INTERACT_QUATERNARY_DOWN "keybinding_human_interact_quaternary_down"
+#define COMSIG_KB_HUMAN_INTERACT_QUICK_EQUIP_DOWN "keybinding_human_interact_quick_equip_down"
+
+#define COMSIG_KB_HUMAN_INTERACT_PICK_UP "keybinding_human_interact_pick_up"
+
 // Human Combat
 #define COMSIG_KB_HUMAN_WEAPON_FIELDSTRIP "keybinding_human_weapon_fieldstrip"
 #define COMSIG_KB_HUMAN_WEAPON_BURSTFIRE "keybinding_human_weapon_burstfire"
@@ -74,6 +88,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"
 
@@ -185,6 +200,7 @@
 //misc yautja
 
 #define COMSIG_KB_YAUTJA_TELE_LOC "keybinding_yautja_tele_loc"
+#define COMSIG_KB_YAUTJA_FOLD_COMBISTICK "keybinding_yautja_fold_combistick"
 
 #define COMSIG_KB_OBSERVER_JOIN_XENO "keybinding_observer_join_as_xeno"
 #define COMSIG_KB_OBSERVER_JOIN_ERT "keybinding_observer_join_ert"
@@ -198,6 +214,7 @@
 #define CATEGORY_CARBON "CARBON"
 #define CATEGORY_HUMAN "HUMAN"
 #define CATEGORY_HUMAN_COMBAT "HUMAN COMBAT"
+#define CATEGORY_HUMAN_INVENTORY "HUMAN INVENTORY"
 #define CATEGORY_ROBOT "ROBOT"
 #define CATEGORY_YAUTJA "YAUTJA"
 #define CATEGORY_MISC "MISC"

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")
+