Merge branch 'master' into facehugger-funny

.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

@@ -63,6 +63,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

README.md

@@ -4,7 +4,7 @@
 
 [![Build Status](https://github.com/PvE-CMSS13/PvE-CMSS13/workflows/CI%20Suite/badge.svg)](https://github.com/PvE-CMSS13/PvE-CMSS13/actions?query=workflow%3A%22CI+Suite%22)
 * **Code:** https://github.com/PvE-CMSS13/PvE-CMSS13
-* **Discord:** https://discord.gg/v6P6wns5dN
+* **Discord:** https://discord.gg/pve-cmss13
 
 This is the codebase for the PvE CM-SS13 fork of CM-SS13 flavoured fork of SpaceStation 13
 

code/__DEFINES/__game.dm

@@ -40,6 +40,7 @@ block( \
 #define MAP_LV522_CHANCES_CLAIM "LV-522 Chance's Claim" // Highpop Only
 #define MAP_NEW_VARADERO "New Varadero"//ice colony underground but as its own map
 #define MAP_CHINOOK "Chinook 91 GSO" //admin level
+#define MAP_DERELICT_ALMAYER "Derelict Almayer"
 
 #define GAMEMODE_WHISKEY_OUTPOST "Whiskey Outpost"
 #define GAMEMODE_HIVE_WARS "Hive Wars"
@@ -154,7 +155,7 @@ block( \
 
 //=================================================
 
-#define TOGGLES_CHAT_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_LOOC|CHAT_GHOSTHIVEMIND)
+#define TOGGLES_CHAT_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTRADIO|CHAT_PRAYER|CHAT_RADIO|CHAT_LOOC|CHAT_GHOSTHIVEMIND)
 
 #define TOGGLES_GHOST_DEFAULT (GHOST_HEALTH_SCAN)
 
@@ -283,7 +284,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 +493,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/access.dm

@@ -45,6 +45,9 @@ most of them are tied into map-placed objects. This should be reworked in the fu
 #define ACCESS_MARINE_ASO 37
 #define ACCESS_MARINE_CHAPLAIN 38
 
+#define ACCESS_SQUAD_ONE 39
+#define ACCESS_SQUAD_TWO 40
+
 // AI Core Accesses
 /// Used in temporary passes
 #define ACCESS_MARINE_AI_TEMP 90

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

@@ -221,6 +221,7 @@
 #define PROPERTY_ANTICARCINOGENIC "anti-carcinogenic"
 #define PROPERTY_UNKNOWN "unknown" //just has an OD effect
 #define PROPERTY_HEMOSITIC "hemositic"
+#define PROPERTY_REVITALIZING "revitalizing"
 
 
 //Property rarity

code/__DEFINES/client_prefs.dm

@@ -32,7 +32,7 @@
 
 #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.
+#define MAX_GEAR_COST 10 //Used in chargen for loadout limit.
 
 ///dual_wield_pref from /datum/preferences
 ///Fire both weapons when dual wielding

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

@@ -67,3 +67,7 @@
 #define COMSIG_HUMAN_SURGERY_APPLY_MODIFIERS "human_surgery_apply_modifiers"
 /// From /mob/living/carbon/human/proc/get_flags_cold_protection()
 #define COMSIG_HUMAN_COLD_PROTECTION_APPLY_MODIFIERS "human_cold_protection_apply_modifiers"
+
+/// From /mob/living/carbon/human/UnarmedAttack()
+#define COMSIG_HUMAN_BEFORE_ATTACK_HAND "human_before_attack_hand"
+	#define COMPONENT_CANCEL_HUMAN_ATTACK_HAND (1<<0)

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

@@ -62,3 +62,12 @@
 
 /// For any additional things that should happen when a xeno's melee_attack_additional_effects_self() proc is called
 #define COMSIG_XENO_SLASH_ADDITIONAL_EFFECTS_SELF "xeno_slash_additional_effects_self"
+
+/// From /mob/living/carbon/xenomorph/proc/handle_crit()
+#define COMSIG_XENO_HANDLE_CRIT "xeno_handle_crit"
+
+/// From /datum/action/xeno_action/activable/pounce/use_ability()
+#define COMSIG_XENO_USED_POUNCE "xeno_used_pounce"
+
+/// From /mob/living/carbon/xenomorph/proc/handle_ai_shot()
+#define COMSIG_XENO_HANDLE_AI_SHOT "xeno_handle_ai_shot"

code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm

@@ -128,3 +128,7 @@
 
 /// From /obj/item/proc/pickup() : (obj/item/picked_up)
 #define COMSIG_MOB_PICKUP_ITEM "mob_pickup_item"
+
+/// From /mob/proc/say_dead(message)
+#define COMSIG_DEAD_SPEAK "comsig_dead_speak"
+		#define COMPONENT_OVERRIDE_DEAD_SPEAK (1<<0)

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

@@ -45,3 +45,23 @@
 
 ///When the transform or an atom is varedited through vv topic.
 #define COMSIG_ATOM_VV_MODIFY_TRANSFORM "atom_vv_modify_transform"
+
+/// From /mob/living/carbon/human/UnarmedAttack()
+#define COMSIG_ATOM_BEFORE_HUMAN_ATTACK_HAND "atom_before_human_attack_hand"
+	#define COMPONENT_CANCEL_ATTACK_HAND (1<<0)
+
+/// From /mob/proc/click_adjacent()
+#define COMSIG_ATOM_MOB_ATTACKBY "atom_mob_attackby"
+	#define COMPONENT_CANCEL_ATTACKBY (1<<0)
+
+/// From /atom/proc/attack_hand()
+#define COMSIG_ATOM_ATTACK_HAND "atom_attack_hand"
+
+/// From /datum/component/phone/proc/picked_up_call() and /datum/component/phone/proc/post_call_phone()
+#define COMSIG_ATOM_PHONE_PICKED_UP "atom_phone_picked_up"
+/// From /datum/component/phone/proc/recall_handset()
+#define COMSIG_ATOM_PHONE_HUNG_UP "atom_phone_hung_up"
+/// From /datum/component/phone/proc/call_phone()
+#define COMSIG_ATOM_PHONE_RINGING "atom_phone_ringing"
+/// From /datum/component/phone/proc/reset_call()
+#define COMSIG_ATOM_PHONE_STOPPED_RINGING "atom_phone_stopped_ringing"

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

@@ -4,11 +4,15 @@
 /// From /atom/movable/proc/launch_towards
 #define COMSIG_MOVABLE_PRE_THROW "movable_pre_throw"
 	#define COMPONENT_CANCEL_THROW (1<<0)
+
 ///from base of atom/movable/Moved(): (/atom, dir, forced)
 #define COMSIG_MOVABLE_MOVED "movable_moved"
 /// From /atom/movable/Move(): (atom/NewLoc)
 #define COMSIG_MOVABLE_PRE_MOVE "movable_pre_move"
 	#define COMPONENT_CANCEL_MOVE (1<<0)
+/// From /atom/movable/proc/forceMove(): (atom/NewLoc)
+#define COMSIG_MOVABLE_FORCEMOVED "movable_forcemove"
+
 /// From /turf/open/gm/river/Entered(): (turf/open/gm/river/river, covered)
 #define COMSIG_MOVABLE_ENTERED_RIVER "movable_entered_river"
 
@@ -29,3 +33,4 @@
 #define COMSIG_MOVABLE_UPDATE_GLIDE_SIZE "movable_glide_size"
 
 #define COMSIG_MOVABLE_TURF_ENTER "movable_turf_enter"
+

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

@@ -22,9 +22,6 @@
 #define COMSIG_SENTRY_EMPTY_AMMO_ALERT "signal_sentry_empty_ammo"
 #define COMSIG_SENTRY_DESTROYED_ALERT "signal_sentry_destroyed"
 
-/// from /obj/structure/transmitter/update_icon()
-#define COMSIG_TRANSMITTER_UPDATE_ICON "transmitter_update_icon"
-
 #define COMSIG_TENT_COLLAPSING "tent_collapsing"
 
 /// from /obj/proc/afterbuckle()

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

@@ -15,7 +15,7 @@
 
 /// From /turf/closed/wall/resin/attackby(): (obj/item/I, mob/M)
 #define COMSIG_WALL_RESIN_ATTACKBY "wall_resin_attackby"
-	#define COMPONENT_CANCEL_ATTACKBY (1<<0)
+	#define COMPONENT_CANCEL_RESIN_ATTACKBY (1<<0)
 
 ///from /turf/closed/wall/proc/place_poster
 #define COMSIG_POSTER_PLACED "poster_placed"

code/__DEFINES/equipment.dm

@@ -552,7 +552,11 @@ var/global/list/uniform_categories = list(
 #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
+#define PHONE_DO_NOT_DISTURB_FORCED 2
+#define PHONE_DO_NOT_DISTURB_ON 1
+#define PHONE_DO_NOT_DISTURB_OFF 0
+#define PHONE_DO_NOT_DISTURB_FORBIDDEN -1
+
+#define PHONE_ON_BASE_UNIT_ICON_STATE "[initial(icon_state)]"
+#define PHONE_OFF_BASE_UNIT_ICON_STATE "[initial(icon_state)]_ear"
+#define PHONE_RINGING_ICON_STATE "[initial(icon_state)]_ring"

code/__DEFINES/minimap.dm

@@ -45,7 +45,7 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))
 #define MINIMAP_AREA_CONTESTED_ZONE "#0603c4ee"
 
 #define MINIMAP_SQUAD_UNKNOWN "#d8d8d8"
-#define MINIMAP_SQUAD_ALPHA "#ed1c24"
+#define MINIMAP_SQUAD_ALPHA "#4148c8"
 #define MINIMAP_SQUAD_BRAVO "#fbc70e"
 #define MINIMAP_SQUAD_CHARLIE "#76418a"
 #define MINIMAP_SQUAD_DELTA "#0c0cae"

code/__DEFINES/mobs.dm

@@ -418,3 +418,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/mode.dm

@@ -58,7 +58,7 @@
 #define MODE_RANDOM_HIVE (1<<12)// Makes Join-as-Xeno choose a hive to join as burrowed larva at random rather than at user's input..
 #define MODE_THUNDERSTORM (1<<13)// Enables thunderstorm effects on maps that are compatible with it. (Lit exterior tiles, rain effects)
 #define MODE_FACTION_CLASH (1<<14)// Disables scopes, sniper sentries, OBs, shooting corpses, dragging enemy corpses, stripping enemy corpses
-#define MODE_NO_XENO_EVOLVE (1<<15) // Stops all xenos from evolving
+#define MODE_NO_XENO_EVOLVE (1<<15) // Stops all xenos from evolving or straining
 
 // Gamemode Toggleable Flags
 #define MODE_NO_SNIPER_SENTRY (1<<0) /// Upgrade kits will no longer allow you to select long-range upgrades

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"

code/__DEFINES/skills.dm

@@ -210,7 +210,7 @@
 #define SKILL_INTEL_MAX 2
 
 // Fireman carry - Separated from police skills for further rebalances. Determines how fast you carry someone.
-#define SKILL_FIREMAN_DEFAULT 2
+#define SKILL_FIREMAN_DEFAULT 3
 #define SKILL_FIREMAN_TRAINED 1
 #define SKILL_FIREMAN_SKILLED 2
 #define SKILL_FIREMAN_EXPERT 3

code/__DEFINES/tgs.dm

@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "6.5.3"
+#define TGS_DMAPI_VERSION "6.6.1"
 
 // 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/weather.dm

@@ -3,6 +3,7 @@
 
 // Probabilities of a weather event occurring each tick, per map
 #define PROB_WEATHER_SOROKYNE 100 //Map specific defines go here.
+#define PROB_WEATHER_SHIVAS_SNOWBALL 80
 #define PROB_WEATHER_BIG_RED 30
 #define PROB_WEATHER_LV624 30
 #define PROB_WEATHER_NEW_VARADERO 100