Merge branch 'master' into jelly-people

beestation.dme

@@ -614,7 +614,6 @@
 #include "code\datums\components\edit_complainer.dm"
 #include "code\datums\components\effect_remover.dm"
 #include "code\datums\components\embedded.dm"
-#include "code\datums\components\empprotection.dm"
 #include "code\datums\components\explodable.dm"
 #include "code\datums\components\footstep.dm"
 #include "code\datums\components\force_move.dm"
@@ -784,6 +783,7 @@
 #include "code\datums\elements\digital_camo.dm"
 #include "code\datums\elements\earhealing.dm"
 #include "code\datums\elements\embed.dm"
+#include "code\datums\elements\empprotection.dm"
 #include "code\datums\elements\firestacker.dm"
 #include "code\datums\elements\forced_gravity.dm"
 #include "code\datums\elements\frozen.dm"
@@ -2893,6 +2893,7 @@
 #include "code\modules\mob\living\death.dm"
 #include "code\modules\mob\living\emote.dm"
 #include "code\modules\mob\living\inhand_holder.dm"
+#include "code\modules\mob\living\init_signals.dm"
 #include "code\modules\mob\living\life.dm"
 #include "code\modules\mob\living\living.dm"
 #include "code\modules\mob\living\living_defense.dm"

code/__DEFINES/icon_smoothing.dm

@@ -13,6 +13,8 @@
 #define SMOOTH_OBJ		(1<<5)
 /// Smooths with atoms facing the same direction only
 #define SMOOTH_DIRECTIONAL (1<<6)
+/// Skips the corner step of bitmask smoothing (does nothing without SMOOTH_BITMASK)
+#define SMOOTH_BITMASK_SKIP_CORNERS (1<<7)
 
 DEFINE_BITFIELD(smoothing_flags, list(
 	"SMOOTH_CORNERS" = SMOOTH_CORNERS,
@@ -22,6 +24,7 @@ DEFINE_BITFIELD(smoothing_flags, list(
 	"SMOOTH_QUEUED" = SMOOTH_QUEUED,
 	"SMOOTH_OBJ" = SMOOTH_OBJ,
 	"SMOOTH_DIRECTIONAL" = SMOOTH_DIRECTIONAL,
+	"SMOOTH_BITMASK_SKIP_CORNERS" = SMOOTH_BITMASK_SKIP_CORNERS,
 ))
 
 
@@ -116,8 +119,7 @@ DEFINE_BITFIELD(smoothing_flags, list(
 #define SMOOTH_GROUP_HEDGE_FLUFF S_OBJ(65)				///obj/structure/fluff/hedge
 #define SMOOTH_GROUP_SHUTTLE_PARTS S_OBJ(66)			///obj/structure/window/shuttle, /obj/structure/window/plasma/reinforced/plastitanium, /turf/closed/indestructible/opsglass, /obj/structure/shuttle
 #define SMOOTH_GROUP_CLEANABLE_DIRT	S_OBJ(67)			///obj/effect/decal/cleanable/dirt
-///obj/machinery/computer/_computer
-#define SMOOTH_GROUP_COMPUTERS S_OBJ (68)
+#define SMOOTH_GROUP_COMPUTERS S_OBJ(68)				///obj/machinery/computer/_computer
 
 //LIQUIDS
 

code/__DEFINES/jobs.dm

@@ -96,9 +96,8 @@
 #define JOB_DISPLAY_ORDER_DETECTIVE 30
 #define JOB_DISPLAY_ORDER_SECURITY_OFFICER 31
 #define JOB_DISPLAY_ORDER_BRIG_PHYS 32
-#define JOB_DISPLAY_ORDER_DEPUTY 33
-#define JOB_DISPLAY_ORDER_AI 34
-#define JOB_DISPLAY_ORDER_CYBORG 35
+#define JOB_DISPLAY_ORDER_AI 33
+#define JOB_DISPLAY_ORDER_CYBORG 34
 
 
 #define DEPT_BITFLAG_COM (1<<0)

code/__DEFINES/maths.dm

@@ -22,7 +22,7 @@
 #define TICK_USAGE_TO_MS(starting_tickusage) (TICK_DELTA_TO_MS(TICK_USAGE_REAL - starting_tickusage))
 
 #define PERCENT(val) (round((val)*100, 0.1))
-#define CLAMP01(x) (CLAMP(x, 0, 1))
+#define CLAMP01(x) (clamp(x, 0, 1))
 
 //time of day but automatically adjusts to the server going into the next day within the same round.
 //for when you need a reliable time number that doesn't depend on byond time.
@@ -39,19 +39,14 @@
 /// `round()` acts like `floor(x, 1)` by default but can't handle other values
 #define FLOOR(x, y) ( round((x) / (y)) * (y) )
 
-#define CLAMP(CLVALUE,CLMIN,CLMAX) clamp(CLVALUE, CLMIN, CLMAX)
-
 /// Similar to clamp but the bottom rolls around to the top and vice versa. min is inclusive, max is exclusive
 #define WRAP(val, min, max) ( min == max ? min : (val) - (round(((val) - (min))/((max) - (min))) * ((max) - (min))) )
 
 /// Real modulus that handles decimals
 #define MODULUS(x, y) ( (x) - FLOOR(x, y))
 
-/// Tangent
-#define TAN(x) tan(x)
-
 /// Cotangent
-#define COT(x) (1 / TAN(x))
+#define COT(x) (1 / tan(x))
 
 /// Secant
 #define SEC(x) (1 / cos(x))
@@ -191,8 +186,8 @@
 	while(pixel_y < -16)
 		pixel_y += 32
 		new_y--
-	new_x = CLAMP(new_x, 0, world.maxx)
-	new_y = CLAMP(new_y, 0, world.maxy)
+	new_x = clamp(new_x, 0, world.maxx)
+	new_y = clamp(new_y, 0, world.maxy)
 	return locate(new_x, new_y, starting.z)
 
 /// Returns a list where [1] is all x values and [2] is all y values that overlap between the given pair of rectangles
@@ -217,7 +212,7 @@
 
 #define EXP_DISTRIBUTION(desired_mean) ( -(1/(1/desired_mean)) * log(rand(1, 1000) * 0.001) )
 
-#define LORENTZ_DISTRIBUTION(x, s) ( s*TAN(TODEGREES(PI*(rand()-0.5))) + x )
+#define LORENTZ_DISTRIBUTION(x, s) ( s*tan(TODEGREES(PI*(rand()-0.5))) + x )
 #define LORENTZ_CUMULATIVE_DISTRIBUTION(x, y, s) ( (1/PI)*TORADIANS(arctan((x-y)/s)) + 1/2 )
 
 #define RULE_OF_THREE(a, b, x) ((a*x)/b)

code/__DEFINES/traits.dm

@@ -122,15 +122,34 @@
 Remember to update _globalvars/traits.dm if you're adding/removing/renaming traits.
 */
 
-/*
-Remember to update _globalvars/traits.dm if you're adding/removing/renaming traits.
+// mob traits for temporary carbon states/status_effects. // TODO: Systematically dismember update_mobility and replace all its checks and updates with these traits, or offload to stat
+
+/// Forces the user to stay unconscious. This shouldn't be used in a check outside of code related to stat and update_stat, or when its being intentionally applied from a specific source
+#define TRAIT_KNOCKEDOUT "knockedout"
+/* All to replace update_mobility with traits
+/// Prevents voluntary movement.
+#define TRAIT_IMMOBILIZED "immobilized"
+/// Prevents voluntary standing or staying up on its own.
+#define TRAIT_FLOORED "floored"
+/// Forces user to stay standing (ensures the unconscious/immobilized dont enter a lying position in cryopods)
+#define TRAIT_FORCED_STANDING "forcedstanding"
+/// Prevents usage of manipulation appendages (picking, holding or using items, manipulating storage).
+#define TRAIT_HANDS_BLOCKED "handsblocked"
+/// Inability to access UI hud elements. Turned into a trait from [MOBILITY_UI] to be able to track sources.
+#define TRAIT_UI_BLOCKED "uiblocked"
+/// Inability to pull things. Turned into a trait from [MOBILITY_PULL] to be able to track sources.
+#define TRAIT_PULL_BLOCKED "pullblocked"
+/// Abstract condition that prevents movement if being pulled and might be resisted against. Handcuffs and straight jackets, basically.
+#define TRAIT_RESTRAINED "restrained"
 */
+#define TRAIT_INCAPACITATED "incapacitated"
 
 //mob traits
-#define TRAIT_INCAPACITATED "incapacitated"
-#define TRAIT_BLIND 			"blind"
-#define TRAIT_MUTE				"mute"
-#define TRAIT_EMOTEMUTE			"emotemute"
+#define TRAIT_BLIND "blind"
+/// Mute. Can't talk.
+#define TRAIT_MUTE "mute"
+/// Emotemute. Can't... emote.
+#define TRAIT_EMOTEMUTE "emotemute"
 #define TRAIT_DEAF				"deaf"
 #define TRAIT_NEARSIGHT			"nearsighted"
 #define TRAIT_FAT				"fat"
@@ -335,6 +354,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define CLOTHING_FEET_TRAIT "feet"
 #define VEHICLE_TRAIT "vehicle" // inherited from riding vehicles
 #define INNATE_TRAIT "innate"
+#define CRIT_HEALTH_TRAIT "crit_health"
+#define OXYLOSS_TRAIT "oxyloss"
 #define GLASSES_TRAIT "glasses"
 #define CURSE_TRAIT "eldritch"
 #define STATION_TRAIT "station-trait"

code/__DEFINES/uplink.dm

@@ -11,3 +11,6 @@
 
 /// This item is purchasable to clown ops
 #define UPLINK_CLOWN_OPS (1 << 3)
+
+/// This item is purchasable to excommunicates
+#define UPLINK_EXCOMMUNICATE (1 << 4)