Merge branch 'master' of https://github.com/MonaraMir/Citadel-Station…

…-13-RP

.github/workflows/stale.yml

@@ -28,5 +28,6 @@ jobs:
         days-before-issue-stale: -1
         stale-issue-label: 'Cleanup Flagged'
         remove-issue-stale-when-updated: false
+        exempt-draft-pr: true
         exempt-pr-labels: 'Good First PR,Work in Progress,Do Not Merge,Stale Exempt'
         operations-per-run: 300

citadel.dme

@@ -84,7 +84,6 @@
 #include "code\__DEFINES\spells.dm"
 #include "code\__DEFINES\stat_tracking.dm"
 #include "code\__DEFINES\statpanel.dm"
-#include "code\__DEFINES\status_effects.dm"
 #include "code\__DEFINES\storage.dm"
 #include "code\__DEFINES\strack_trace.dm"
 #include "code\__DEFINES\targeting.dm"
@@ -174,6 +173,7 @@
 #include "code\__DEFINES\dcs\signals\signals_mob\signals_mob_combat.dm"
 #include "code\__DEFINES\dcs\signals\signals_mob\signals_mob_inventory.dm"
 #include "code\__DEFINES\dcs\signals\signals_mob\signals_mob_main.dm"
+#include "code\__DEFINES\dcs\signals\signals_mob\signals_mob_mobility.dm"
 #include "code\__DEFINES\dcs\signals\signals_mob\signals_mob_organs.dm"
 #include "code\__DEFINES\dcs\signals\signals_mob\signals_mob_perspectiive.dm"
 #include "code\__DEFINES\economy\economy.dm"
@@ -212,6 +212,7 @@
 #include "code\__DEFINES\mobs\organs.dm"
 #include "code\__DEFINES\mobs\silicon_privileges.dm"
 #include "code\__DEFINES\mobs\sprite_accessories.dm"
+#include "code\__DEFINES\mobs\stat.dm"
 #include "code\__DEFINES\overmaps\misc.dm"
 #include "code\__DEFINES\overmaps\overmap.dm"
 #include "code\__DEFINES\power\balancing.dm"
@@ -229,6 +230,7 @@
 #include "code\__DEFINES\procs\clickcode.dm"
 #include "code\__DEFINES\procs\do_after.dm"
 #include "code\__DEFINES\procs\drain_energy.dm"
+#include "code\__DEFINES\procs\saycode.dm"
 #include "code\__DEFINES\procs\update_icon.dm"
 #include "code\__DEFINES\projectiles\ammo_casing.dm"
 #include "code\__DEFINES\projectiles\guns.dm"
@@ -345,7 +347,7 @@
 #include "code\__HELPERS\lists\unique.dm"
 #include "code\__HELPERS\math\angles.dm"
 #include "code\__HELPERS\matrices\color_matrix.dm"
-#include "code\__HELPERS\matrices\transfor_matrix.dm"
+#include "code\__HELPERS\matrices\transform_matrix.dm"
 #include "code\__HELPERS\misc\sonar.dm"
 #include "code\__HELPERS\rendering\positioning.dm"
 #include "code\__HELPERS\sanitize\datatypes.dm"
@@ -512,6 +514,7 @@
 #include "code\controllers\subsystem\sonar.dm"
 #include "code\controllers\subsystem\spacedrift.dm"
 #include "code\controllers\subsystem\statpanel.dm"
+#include "code\controllers\subsystem\status_effects.dm"
 #include "code\controllers\subsystem\sun.dm"
 #include "code\controllers\subsystem\supply.dm"
 #include "code\controllers\subsystem\tgui.dm"
@@ -561,7 +564,6 @@
 #include "code\controllers\subsystem\processing\pathfinder.dm"
 #include "code\controllers\subsystem\processing\processing.dm"
 #include "code\controllers\subsystem\processing\projectiles.dm"
-#include "code\controllers\subsystem\processing\status_effects.dm"
 #include "code\controllers\subsystem\processing\turfs.dm"
 #include "code\controllers\subsystem\sound\_sound.dm"
 #include "code\controllers\subsystem\sound\channel_manager.dm"
@@ -742,7 +744,6 @@
 #include "code\datums\observation\observation.dm"
 #include "code\datums\observation\shuttle_added.dm"
 #include "code\datums\observation\shuttle_moved.dm"
-#include "code\datums\observation\stat_set.dm"
 #include "code\datums\observation\~cleanup.dm"
 #include "code\datums\outfits\_defines.dm"
 #include "code\datums\outfits\ghostrole.dm"
@@ -772,9 +773,13 @@
 #include "code\datums\soundbytes\announcer.dm"
 #include "code\datums\soundbytes\effects\explosion.dm"
 #include "code\datums\soundbytes\machinery\terminal.dm"
+#include "code\datums\status_effects\grouped.dm"
+#include "code\datums\status_effects\stacking.dm"
 #include "code\datums\status_effects\status_effect.dm"
-#include "code\datums\status_effects\debuffs\crusher_mark.dm"
-#include "code\datums\status_effects\neutral\crusher_track.dm"
+#include "code\datums\status_effects\basic\crusher_track.dm"
+#include "code\datums\status_effects\basic\incapacitation.dm"
+#include "code\datums\status_effects\basic\staggered.dm"
+#include "code\datums\status_effects\grouped\crusher_mark.dm"
 #include "code\datums\underwear\bottom.dm"
 #include "code\datums\underwear\socks.dm"
 #include "code\datums\underwear\top.dm"
@@ -828,6 +833,7 @@
 #include "code\game\skincmd.dm"
 #include "code\game\sound.dm"
 #include "code\game\statistics.dm"
+#include "code\game\trader_visit.dm"
 #include "code\game\world.dm"
 #include "code\game\antagonist\_antagonist_setup.dm"
 #include "code\game\antagonist\antagonist.dm"
@@ -850,6 +856,7 @@
 #include "code\game\antagonist\outsider\ninja.dm"
 #include "code\game\antagonist\outsider\raider.dm"
 #include "code\game\antagonist\outsider\technomancer.dm"
+#include "code\game\antagonist\outsider\trader.dm"
 #include "code\game\antagonist\outsider\wizard.dm"
 #include "code\game\antagonist\station\changeling.dm"
 #include "code\game\antagonist\station\cultist.dm"
@@ -867,6 +874,7 @@
 #include "code\game\area\areas_movement.dm"
 #include "code\game\area\asteroid_areas.dm"
 #include "code\game\area\Away Mission areas.dm"
+#include "code\game\area\darkspace_area.dm"
 #include "code\game\area\misc.dm"
 #include "code\game\area\Off Station Areas.dm"
 #include "code\game\area\rift_areas.dm"
@@ -1068,6 +1076,7 @@
 #include "code\game\landmarks\unit_test_markers.dm"
 #include "code\game\landmarks\spawnpoint\_spawnpoint.dm"
 #include "code\game\landmarks\spawnpoint\talon.dm"
+#include "code\game\landmarks\spawnpoint\tradeport.dm"
 #include "code\game\landmarks\spawnpoint\station\jobs.dm"
 #include "code\game\landmarks\spawnpoint\station\misc.dm"
 #include "code\game\machinery\_frame.dm"
@@ -1115,7 +1124,6 @@
 #include "code\game\machinery\newscaster.dm"
 #include "code\game\machinery\nuclear_bomb.dm"
 #include "code\game\machinery\OpTable.dm"
-#include "code\game\machinery\overview.dm"
 #include "code\game\machinery\oxygen_pump.dm"
 #include "code\game\machinery\partslathe_vr.dm"
 #include "code\game\machinery\pda_multicaster.dm"
@@ -1941,7 +1949,6 @@
 #include "code\modules\admin\verbs\randomverbs.dm"
 #include "code\modules\admin\verbs\randomverbs_vr.dm"
 #include "code\modules\admin\verbs\smite.dm"
-#include "code\modules\admin\verbs\smite_vr.dm"
 #include "code\modules\admin\verbs\striketeam.dm"
 #include "code\modules\admin\verbs\ticklag.dm"
 #include "code\modules\admin\verbs\tripAI.dm"
@@ -2537,7 +2544,6 @@
 #include "code\modules\ghostroles\roles\ashlander.dm"
 #include "code\modules\ghostroles\roles\hermit.dm"
 #include "code\modules\ghostroles\roles\pirate.dm"
-#include "code\modules\ghostroles\roles\trader.dm"
 #include "code\modules\ghosttrap\trap.dm"
 #include "code\modules\holidays\_holiday.dm"
 #include "code\modules\holidays\christmas.dm"
@@ -2885,6 +2891,7 @@
 #include "code\modules\maps\overmap\space\talon\talon.dm"
 #include "code\modules\maps\overmap\space\talon\talon_areas.dm"
 #include "code\modules\maps\overmap\space\trade_station\trade_station.dm"
+#include "code\modules\maps\overmap\space\trade_station\trade_station_jobs.dm"
 #include "code\modules\maps\overmap\space\triumph\triumph.dm"
 #include "code\modules\maps\templates\badmin_misc\fun.dm"
 #include "code\modules\maps\templates\badmin_misc\templates.dm"
@@ -3011,14 +3018,15 @@
 #include "code\modules\mob\mob_defines.dm"
 #include "code\modules\mob\mob_helpers.dm"
 #include "code\modules\mob\mob_planes.dm"
-#include "code\modules\mob\mob_pull.dm"
 #include "code\modules\mob\mob_transformation_simple.dm"
 #include "code\modules\mob\mobility.dm"
 #include "code\modules\mob\movement.dm"
 #include "code\modules\mob\perspective.dm"
 #include "code\modules\mob\physiology.dm"
+#include "code\modules\mob\pulling.dm"
 #include "code\modules\mob\say.dm"
 #include "code\modules\mob\say_vr.dm"
+#include "code\modules\mob\ssd.dm"
 #include "code\modules\mob\status_procs.dm"
 #include "code\modules\mob\throwing.dm"
 #include "code\modules\mob\transform_procs.dm"
@@ -3091,16 +3099,16 @@
 #include "code\modules\mob\living\life.dm"
 #include "code\modules\mob\living\living.dm"
 #include "code\modules\mob\living\living_defines.dm"
-#include "code\modules\mob\living\living_defines_vr.dm"
 #include "code\modules\mob\living\living_powers.dm"
 #include "code\modules\mob\living\living_vr.dm"
 #include "code\modules\mob\living\login.dm"
 #include "code\modules\mob\living\logout.dm"
+#include "code\modules\mob\living\mobility.dm"
 #include "code\modules\mob\living\movement.dm"
 #include "code\modules\mob\living\organs.dm"
 #include "code\modules\mob\living\resist.dm"
 #include "code\modules\mob\living\say.dm"
-#include "code\modules\mob\living\status_indicators.dm"
+#include "code\modules\mob\living\status_procs.dm"
 #include "code\modules\mob\living\throwing.dm"
 #include "code\modules\mob\living\bot\assembly.dm"
 #include "code\modules\mob\living\bot\bot.dm"
@@ -3171,7 +3179,6 @@
 #include "code\modules\mob\living\carbon\human\human_defines.dm"
 #include "code\modules\mob\living\carbon\human\human_helpers.dm"
 #include "code\modules\mob\living\carbon\human\human_modular_limbs.dm"
-#include "code\modules\mob\living\carbon\human\human_movement.dm"
 #include "code\modules\mob\living\carbon\human\human_organs.dm"
 #include "code\modules\mob\living\carbon\human\human_powers.dm"
 #include "code\modules\mob\living\carbon\human\human_resist.dm"
@@ -3181,10 +3188,13 @@
 #include "code\modules\mob\living\carbon\human\login.dm"
 #include "code\modules\mob\living\carbon\human\logout.dm"
 #include "code\modules\mob\living\carbon\human\MedicalSideEffects.dm"
+#include "code\modules\mob\living\carbon\human\mobility.dm"
+#include "code\modules\mob\living\carbon\human\movement.dm"
 #include "code\modules\mob\living\carbon\human\npcs.dm"
 #include "code\modules\mob\living\carbon\human\pain.dm"
 #include "code\modules\mob\living\carbon\human\riding.dm"
 #include "code\modules\mob\living\carbon\human\say.dm"
+#include "code\modules\mob\living\carbon\human\status_procs.dm"
 #include "code\modules\mob\living\carbon\human\stripping.dm"
 #include "code\modules\mob\living\carbon\human\unarmed_attack.dm"
 #include "code\modules\mob\living\carbon\human\update_icons.dm"
@@ -3246,10 +3256,12 @@
 #include "code\modules\mob\living\silicon\robot\emote.dm"
 #include "code\modules\mob\living\silicon\robot\examine.dm"
 #include "code\modules\mob\living\silicon\robot\examine_vr.dm"
+#include "code\modules\mob\living\silicon\robot\health.dm"
 #include "code\modules\mob\living\silicon\robot\inventory.dm"
 #include "code\modules\mob\living\silicon\robot\laws.dm"
 #include "code\modules\mob\living\silicon\robot\life.dm"
 #include "code\modules\mob\living\silicon\robot\login.dm"
+#include "code\modules\mob\living\silicon\robot\mobility.dm"
 #include "code\modules\mob\living\silicon\robot\photos.dm"
 #include "code\modules\mob\living\silicon\robot\robot.dm"
 #include "code\modules\mob\living\silicon\robot\robot_animation_vr.dm"
@@ -3549,6 +3561,7 @@
 #include "code\modules\modular_computers\NTNet\NTNRC\conversation.dm"
 #include "code\modules\movespeed\movespeed_modifier.dm"
 #include "code\modules\movespeed\modifiers\misc.dm"
+#include "code\modules\movespeed\modifiers\mob.dm"
 #include "code\modules\multiz\atoms.dm"
 #include "code\modules\multiz\basic.dm"
 #include "code\modules\multiz\falling.dm"
@@ -4604,6 +4617,7 @@
 #include "code\modules\xenobio\items\slimepotions.dm"
 #include "code\modules\xenobio\items\weapons.dm"
 #include "code\modules\xenobio\machinery\processor.dm"
+#include "donator\unclebourbon\pmc_mask.dm"
 #include "interface\interface.dm"
 #include "interface\stylesheet.dm"
 #include "interface\skin.dmf"

code/__DEFINES/MC.dm

@@ -1,4 +1,5 @@
 #define MC_TICK_CHECK ( ( TICK_USAGE > Master.current_ticklimit || src.state != SS_RUNNING ) ? pause() : 0 )
+#define MC_TICK_CHECK_USAGE ( ( TICK_USAGE > Master.current_ticklimit ) ? pause() : 0 )
 
 #define MC_SPLIT_TICK_INIT(phase_count) var/original_tick_limit = Master.current_ticklimit; var/split_tick_phases = ##phase_count
 #define MC_SPLIT_TICK \

code/__DEFINES/_core.dm

@@ -4,3 +4,4 @@
 /// stack trace without messing with file/line - kudos lohikar c:
 #define STACK_TRACE(msg) try { CRASH("trace: [msg]"); } catch(var/exception/___E) {___rethrow_exception(___E); };
 /proc/___rethrow_exception(exception/E)
+	throw E

code/__DEFINES/admin/admin.dm

@@ -52,9 +52,10 @@
 #define SMITE_DARKSPACE_ABDUCT      "Darkspace Abduction"
 #define SMITE_DISLOCATEALL          "Dislocate All Limbs"
 #define SMITE_LIGHTNINGBOLT         "Lightning Bolt"
-#define SMITE_SHADEKIN_ATTACK       "Shadekin (Attack)"
-#define SMITE_SHADEKIN_NOMF         "Shadekin (Devour)"
 #define SMITE_SPONTANEOUSCOMBUSTION "Spontaneous Combustion"
+#define SMITE_DROP_LIMB_RANDOM		"Remove one(1) arm and one(1) leg"
+#define SMITE_DROP_LIMB_ALL			"Remove all(4) limbs"
+#define SMITE_DROP_LIMB_PICK		"Remove one specific limb"
 
 #define ADMIN_LOOKUP(user)           ("[key_name_admin(user)][ADMIN_QUE(user)]")
 #define ADMIN_LOOKUPFLW(user)        ("[key_name_admin(user)][ADMIN_QUE(user)] [ADMIN_FLW(user)]")

code/__DEFINES/dcs/signals/signals_mob/signals_mob_inventory.dm

@@ -1,4 +1,8 @@
-/// A mob has just equipped an item. Called on [/mob] from base of [/obj/item/equipped()]: (/obj/item/equipped_item, slot)
-//#define COMSIG_MOB_EQUIPPED_ITEM "mob_equipped_item"
-/// A mob has just unequipped an item.
-//#define COMSIG_MOB_UNEQUIPPED_ITEM "mob_unequipped_item"
+/// A mob has just equipped an item. Called on [/mob] from base of [/obj/item/equipped()]: (/obj/item/equipped_item, slot, inv_op_flags)
+#define COMSIG_MOB_ITEM_EQUIPPED "mob_equipped_item"
+/// A mob has just unequipped an item. Called on [/mob] from base of [/obj/item/unequipped()]: (/obj/item/equipped_item, slot, inv_op_flags)
+#define COMSIG_MOB_ITEM_UNEQUIPPED "mob_unequipped_item"
+/// A mob has just picked up an item. Called on [/mob] from base of [/obj/item/pickup()]: (/obj/item/equipped_item, inv_op_flags, old_loc)
+#define COMSIG_MOB_ITEM_PICKUP "mob_pickup_item"
+/// A mob has just dropped an item. Called on [/mob] from base of [/obj/item/dropped()]: (/obj/item/equipped_item, inv_op_flags, new_loc)
+#define COMSIG_MOB_ITEM_DROPPED "mob_dropped_item"

code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm

@@ -53,19 +53,6 @@
 
 //! ALL OF THESE DO NOT TAKE INTO ACCOUNT WHETHER AMOUNT IS 0 OR LOWER AND ARE SENT REGARDLESS! !//
 
-/// From base of mob/living/Stun() (amount, ignore_canstun)
-////#define COMSIG_LIVING_STATUS_STUN "living_stun"
-/// From base of mob/living/Knockdown() (amount, ignore_canstun)
-////#define COMSIG_LIVING_STATUS_KNOCKDOWN "living_knockdown"
-/// From base of mob/living/Paralyze() (amount, ignore_canstun)
-////#define COMSIG_LIVING_STATUS_PARALYZE "living_paralyze"
-/// From base of mob/living/Immobilize() (amount, ignore_canstun)
-////#define COMSIG_LIVING_STATUS_IMMOBILIZE "living_immobilize"
-/// From base of mob/living/Unconscious() (amount, ignore_canstun)
-////#define COMSIG_LIVING_STATUS_UNCONSCIOUS "living_unconscious"
-/// From base of mob/living/Sleeping() (amount, ignore_canstun)
-////#define COMSIG_LIVING_STATUS_SLEEP "living_sleeping"
-	////#define COMPONENT_NO_STUN (1<<0) //For all of them
 /// From base of /mob/living/can_track(): (mob/user)
 ////#define COMSIG_LIVING_CAN_TRACK "mob_cantrack"
 	////#define COMPONENT_CANT_TRACK (1<<0)

code/__DEFINES/dcs/signals/signals_mob/signals_mob_mobility.dm

@@ -0,0 +1,6 @@
+/// sent at the very end of /mob/update_mobility(): (new_mobility_flags)
+#define COMSIG_MOB_ON_UPDATE_MOBILITY "mob_updated_mobility"
+/// sent at the very end of /mob/set_resitng(): (new_resting)
+#define COMSIG_MOB_ON_SET_RESTING "mob_set_resting"
+/// sent at the very end of /mob/update_lying(): (old_lying, new_lying)
+#define COMSIG_MOB_ON_UPDATE_LYING "mob_updated_lying"

code/__DEFINES/directional.dm

@@ -16,9 +16,6 @@
 /// West direction as a string "[8]"
 #define TEXT_WEST "[WEST]"
 
-/// Inverse direction, taking into account UP|DOWN if necessary.
-#define REVERSE_DIR(dir) ( ((dir & 85) << 1) | ((dir & 170) >> 1) )
-
 ///Returns true if the dir is diagonal, false otherwise
 #define ISDIAGONALDIR(d) (d&(d-1))
 ///True if the dir is north or south, false therwise

code/__DEFINES/gamemode.dm

@@ -75,6 +75,7 @@ var/list/be_special_flags = list(
 #define MODE_COMMANDO "commando"
 #define MODE_DEATHSQUAD "deathsquad"
 #define MODE_ERT "ert"
+#define MODE_TRADE "trader"
 #define MODE_MERCENARY "mercenary"
 #define MODE_NINJA "ninja"
 #define MODE_RAIDER "raider"

code/__DEFINES/jobs/spawnpoints.dm

@@ -4,7 +4,7 @@
 /// Arrivals shuttle
 #define LATEJOIN_METHOD_ARRIVALS_SHUTTLE	"Arrivals Shuttle"
 /// Cryostorage
-#define LATEJOIN_METHOD_CRYOGENIC_STORAGE	"Cryogenics bay"
+#define LATEJOIN_METHOD_CRYOGENIC_STORAGE	"Cryogenic storage"
 /// Gateway teleport in
 #define LATEJOIN_METHOD_GATEWAY				"Gateway"
 /// Robotic storage

code/__DEFINES/mobs.dm

@@ -75,19 +75,20 @@
 //////////////////////////////////
 
 // Bitflags defining which status effects could be or are inflicted on a mob.
-#define CANSTUN     0x1
-#define CANWEAKEN   0x2
-#define CANPARALYSE 0x4
-#define CANPUSH     0x8
-#define LEAPING     0x10
-#define HIDING      0x20
-/// Mob has a cortical borer or holders inside of it that need to see emotes.
-#define PASSEMOTES  0x40
-#define GODMODE     0x1000
-/// Replaces stuff like changeling.changeling_fakedeath.
-#define FAKEDEATH   0x2000
-/// Set but never checked. Remove this sometime and replace occurences with the appropriate organ code
-#define DISFIGURED  0x4000
+#define STATUS_CAN_STUN      (1<<0) //! Can Stun()
+#define STATUS_CAN_KNOCKDOWN (1<<1) //! Can Knockdown()
+#define STATUS_CAN_ROOT      (1<<2) //! Can Root()
+#define STATUS_CAN_STAGGER   (1<<3) //! Can Stagger()
+#define STATUS_CAN_PARALYZE  (1<<4) //! Can Paralyze()
+#define STATUS_CAN_PUSH      (1<<5) //! Can Push()
+
+#define STATUS_LEAPING       (1<<20) //! Is leaping (??? legacy)
+#define STATUS_HIDING        (1<<21) //! Is hiding  (??? legacy)
+#define STATUS_GODMODE       (1<<22) //! Godmode    (??? legacy)
+#define STATUS_FAKEDEATH     (1<<23) //! In fakedeath - SLATED FOR REMOVAL, THIS SHOULD BE TRAIT
+
+#define STATUS_FLAGS_DEFAULT (STATUS_CAN_STUN | STATUS_CAN_PARALYZE | STATUS_CAN_PUSH \
+| STATUS_CAN_KNOCKDOWN | STATUS_CAN_ROOT | STATUS_CAN_STAGGER)
 
 #define BORGMESON 0x1
 #define BORGTHERM 0x2