Merge branch '13113'

code/__DEFINES/antagonists.dm

@@ -63,6 +63,16 @@
 #define CONTRACT_UPLINK_PAGE_CONTRACTS "CONTRACTS"
 #define CONTRACT_UPLINK_PAGE_HUB "HUB"
 
+
+///Heretics --
+#define IS_HERETIC(mob) (mob.mind?.has_antag_datum(/datum/antagonist/heretic))
+
+#define PATH_SIDE "Side"
+
+#define PATH_ASH "Ash"
+#define PATH_RUST "Rust"
+#define PATH_FLESH "Flesh"
+
 //Overthrow time to update heads obj
 #define OBJECTIVE_UPDATING_TIME 300
 
@@ -91,4 +101,4 @@
 #define BLOB_REROLL_TIME 2400 // blob gets a free reroll every X time
 #define BLOB_SPREAD_COST 4
 #define BLOB_ATTACK_REFUND 2 //blob refunds this much if it attacks and doesn't spread
-#define BLOB_REFLECTOR_COST 15
+#define BLOB_REFLECTOR_COST 15

code/__DEFINES/atom_hud.dm

@@ -60,6 +60,7 @@
 #define ANTAG_HUD_BROTHER		23
 #define ANTAG_HUD_BLOODSUCKER   24
 #define ANTAG_HUD_FUGITIVE		25
+#define ANTAG_HUD_HERETIC	26
 
 // Notification action types
 #define NOTIFY_JUMP "jump"

code/__DEFINES/footsteps.dm

@@ -7,6 +7,8 @@
 #define FOOTSTEP_WATER "water"
 #define FOOTSTEP_LAVA "lava"
 #define FOOTSTEP_MEAT "meat"
+#define FOOTSTEP_RUST "rust"
+
 //barefoot sounds
 #define FOOTSTEP_WOOD_BAREFOOT "woodbarefoot"
 #define FOOTSTEP_WOOD_CLAW "woodclaw"
@@ -91,7 +93,9 @@ GLOBAL_LIST_INIT(footstep, list(
 		'sound/effects/footstep/lava2.ogg',
 		'sound/effects/footstep/lava3.ogg'), 100, 0),
 	FOOTSTEP_MEAT = list(list(
-		'sound/effects/meatslap.ogg'), 100, 0)
+		'sound/effects/meatslap.ogg'), 100, 0),
+	FOOTSTEP_RUST = list(list(
+		'sound/effects/footstep/rustystep1.ogg'), 100, 0)
 ))
 
 //bare footsteps lists
@@ -135,7 +139,9 @@ GLOBAL_LIST_INIT(barefootstep, list(
 		'sound/effects/footstep/lava2.ogg',
 		'sound/effects/footstep/lava3.ogg'), 100, 0),
 	FOOTSTEP_MEAT = list(list(
-		'sound/effects/meatslap.ogg'), 100, 0)
+		'sound/effects/meatslap.ogg'), 100, 0),
+	FOOTSTEP_RUST = list(list(
+		'sound/effects/footstep/rustystep1.ogg'), 100, 0)
 ))
 
 //claw footsteps lists
@@ -179,7 +185,9 @@ GLOBAL_LIST_INIT(clawfootstep, list(
 		'sound/effects/footstep/lava2.ogg',
 		'sound/effects/footstep/lava3.ogg'), 100, 0),
 	FOOTSTEP_MEAT = list(list(
-		'sound/effects/meatslap.ogg'), 100, 0)
+		'sound/effects/meatslap.ogg'), 100, 0),
+	FOOTSTEP_RUST = list(list(
+		'sound/effects/footstep/rustystep1.ogg'), 100, 0)
 ))
 
 //heavy footsteps list
@@ -197,5 +205,7 @@ GLOBAL_LIST_INIT(heavyfootstep, list(
 		'sound/effects/footstep/lava2.ogg',
 		'sound/effects/footstep/lava3.ogg'), 100, 0),
 	FOOTSTEP_MEAT = list(list(
-		'sound/effects/meatslap.ogg'), 100, 0)
+		'sound/effects/meatslap.ogg'), 100, 0),
+	FOOTSTEP_RUST = list(list(
+		'sound/effects/footstep/rustystep1.ogg'), 150, 2)
 ))

code/__DEFINES/maths.dm

@@ -46,6 +46,8 @@
 // Cosecant
 #define CSC(x) (1 / sin(x))
 
+#define ATAN2(x, y) ( !(x) && !(y) ? 0 : (y) >= 0 ? arccos((x) / sqrt((x)*(x) + (y)*(y))) : -arccos((x) / sqrt((x)*(x) + (y)*(y))) )
+
 // Greatest Common Divisor - Euclid's algorithm
 /proc/Gcd(a, b)
 	return b ? Gcd(b, (a) % (b)) : a

code/__DEFINES/mobs.dm

@@ -332,3 +332,5 @@
 
 /// If you examine the same atom twice in this timeframe, we call examine_more() instead of examine()
 #define EXAMINE_MORE_TIME	1 SECONDS
+
+#define SILENCE_RANGED_MESSAGE (1<<0) 

code/__DEFINES/role_preferences.dm

@@ -17,6 +17,7 @@
 #define ROLE_ALIEN					"xenomorph"
 #define ROLE_PAI					"pAI"
 #define ROLE_CULTIST				"cultist"
+#define ROLE_HERETIC				"Heretic"
 #define ROLE_BLOB					"blob"
 #define ROLE_NINJA					"space ninja"
 #define ROLE_MONKEY					"monkey"
@@ -64,6 +65,7 @@ GLOBAL_LIST_INIT(special_roles, list(
 	ROLE_INTERNAL_AFFAIRS = /datum/game_mode/traitor/internal_affairs,
 	ROLE_SENTIENCE,
 	ROLE_GANG = /datum/game_mode/gang,
+	ROLE_HERETIC = /datum/game_mode/heretics,
 	ROLE_BLOODSUCKER = /datum/game_mode/bloodsucker
 	//ROLE_MONSTERHUNTER Disabled for now
 ))

code/__DEFINES/status_effects.dm

@@ -111,6 +111,10 @@
 
 #define STATUS_EFFECT_LIMP /datum/status_effect/limp //For when you have a busted leg (or two!) and want additional slowdown when walking on that leg
 
+#define STATUS_EFFECT_AMOK /datum/status_effect/amok //Makes the target automatically strike out at adjecent non-heretics.
+
+#define STATUS_EFFECT_CLOUDSTRUCK /datum/status_effect/cloudstruck //blinds and applies an overlay.
+
 /// shoves inflict this to indicate the next shove while this is in effect should disarm guns
 #define STATUS_EFFECT_OFF_BALANCE /datum/status_effect/off_balance
 

code/__DEFINES/traits.dm

@@ -104,7 +104,9 @@
 #define TRAIT_RESISTCOLD		"resist_cold"
 #define TRAIT_RESISTHIGHPRESSURE	"resist_high_pressure"
 #define TRAIT_RESISTLOWPRESSURE	"resist_low_pressure"
+#define TRAIT_BOMBIMMUNE		"bomb_immunity"
 #define TRAIT_RADIMMUNE			"rad_immunity"
+#define TRAIT_GENELESS			"geneless"
 #define TRAIT_VIRUSIMMUNE		"virus_immunity"
 #define TRAIT_PIERCEIMMUNE		"pierce_immunity"
 #define TRAIT_NODISMEMBER		"dismember_immunity"
@@ -257,6 +259,7 @@
 #define CURSED_ITEM_TRAIT "cursed-item" // The item is magically cursed
 #define ABSTRACT_ITEM_TRAIT "abstract-item"
 #define STATUS_EFFECT_TRAIT "status-effect"
+#define CLOTHING_TRAIT "clothing"
 #define ROUNDSTART_TRAIT "roundstart" //cannot be removed without admin intervention
 #define GHOSTROLE_TRAIT "ghostrole"
 #define APHRO_TRAIT "aphro"
@@ -311,4 +314,4 @@
 #define ACTIVE_BLOCK_TRAIT				"active_block"
 /// This trait is added by the parry system.
 #define ACTIVE_PARRY_TRAIT				"active_parry"
-#define STICKY_NODROP "sticky-nodrop" //sticky nodrop sounds like a bad soundcloud rapper's name
+#define STICKY_NODROP "sticky-nodrop" //sticky nodrop sounds like a bad soundcloud rapper's name