Xeno and a bit of defines cleanup.

code/__DEFINES/__game.dm

@@ -38,7 +38,6 @@
 
 #define INVISIBILITY_ABSTRACT 101 //only used for abstract objects (e.g. spacevine_controller), things that are not really there.
 
-
 //Object specific defines
 #define CANDLE_LUM 3 //For how bright candles are
 
@@ -47,24 +46,11 @@
 #define SEC_LEVEL_RED 2
 #define SEC_LEVEL_DELTA 3
 
-
-//=================================================
-#define HOSTILE_STANCE_IDLE 1
-#define HOSTILE_STANCE_ALERT 2
-#define HOSTILE_STANCE_ATTACK 3
-#define HOSTILE_STANCE_ATTACKING 4
-#define HOSTILE_STANCE_TIRED 5
-//=================================================
-
-
 //=================================================
 //Game mode related defines.
 
 #define TRANSITIONEDGE 3 //Distance from edge to move to another z-level
 
-//Flags for zone sleeping
-#define ZONE_ACTIVE 1
-#define ZONE_SLEEPING 0
 #define GET_RANDOM_FREQ rand(32000, 55000) //Frequency stuff only works with 45kbps oggs.
 
 //ceiling types
@@ -77,7 +63,6 @@
 #define CEILING_DEEP_UNDERGROUND 6
 #define CEILING_DEEP_UNDERGROUND_METAL 6
 
-
 // Default font settings
 #define FONT_SIZE "5pt"
 #define FONT_COLOR "#09f"
@@ -89,21 +74,13 @@
 
 #define GAME_YEAR (text2num(time2text(world.realtime, "YYYY")) + 395)
 
-
 #define MAX_MESSAGE_LEN 1024
 #define MAX_PAPER_MESSAGE_LEN 3072
 #define MAX_BOOK_MESSAGE_LEN 9216
 #define MAX_NAME_LEN 26
 #define MAX_BROADCAST_LEN 512
 #define MAX_NAME_HYPO 3
 
-
-//for whether AI eyes see static, and whether it is mouse-opaque or not
-#define USE_STATIC_NONE 0
-#define USE_STATIC_TRANSPARENT 1
-#define USE_STATIC_OPAQUE 2
-
-
 #define CINEMATIC_DEFAULT 1
 #define CINEMATIC_SELFDESTRUCT 2
 #define CINEMATIC_SELFDESTRUCT_MISS 3

code/__DEFINES/_radio.dm

@@ -60,13 +60,13 @@
 #define RADIO_CHANNEL_ECHO "Echo"
 #define RADIO_CHANNEL_DS1 "Alamo"
 #define RADIO_CHANNEL_DS2 "Normandy"
-#define RADIO_CHANNEL_YAUTJA "Yautja" //RU TGMC ADDITION
+#define RADIO_CHANNEL_YAUTJA "Yautja"
 
 #define MIN_FREE_FREQ 1201 // -------------------------------------------------
 // Frequencies are always odd numbers and range from 1201 to 1599.
 
 //Preds
-#define YAUT_FREQ 1233 //RU TGMC ADDITION
+#define YAUT_FREQ 1233
 
 //SOM squads
 #define FREQ_COMMAND_SOM 1235
@@ -119,14 +119,11 @@
 
 #define FREQ_CIV_GENERAL 1469
 
-
 #define MAX_FREQ 1489 // ------------------------------------------------------
 
-
 #define MAX_FREE_FREQ 1599 // -------------------------------------------------
 
 
-
 // Transmission types.
 #define TRANSMISSION_WIRE 0  // some sort of wired connection, not used
 #define TRANSMISSION_RADIO 1  // electromagnetic radiation (default)

code/__DEFINES/actions.dm

@@ -13,15 +13,12 @@
 #define ABILITY_IGNORE_DEAD_TARGET (1 << 13) // bypass checks of a dead target
 #define ABILITY_IGNORE_SELECTED_ABILITY (1 << 14) // bypass the check of the selected ability
 #define ABILITY_DO_AFTER_ATTACK (1 << 15) //Let the xeno attack the object and perform the ability.
-#define ABILITY_USE_BURROWED (1 << 16) // ignore being burrowed
-#define ABILITY_USE_ROOTED (1 << 17) // ignore being currently rooted
 
 #define ABILITY_TURF_TARGET (1 << 0) // ability targets turfs
 #define ABILITY_MOB_TARGET (1 << 1) // ability targets mobs
 
 #define ABILITY_KEYBIND_USE_ABILITY (1 << 0) // immediately activate even if selectable
 
-
 #define ABILITY_CRASH (1<<0)
 #define ABILITY_NUCLEARWAR (1<<1)
 #define ABILITY_ALL_GAMEMODE (ABILITY_CRASH|ABILITY_NUCLEARWAR)

code/__DEFINES/area.dm

@@ -14,7 +14,7 @@
 #define NO_DROPPOD (1<<2)
 ///Make this area immune to cas/ob laser. Explosions can still go through if the ob is called in a nearby area
 #define OB_CAS_IMMUNE (1<<3)
-///Prevent wraith from portaling there, and hivemind to weed there when shutters are closed
+///Prevent hivemind to weed there when shutters are closed
 #define MARINE_BASE (1<<4)
 ///radio works even underground
 #define ALWAYS_RADIO (1<<5)

code/__DEFINES/cooldowns.dm

@@ -45,7 +45,6 @@
 #define COOLDOWN_GAS_BREATH "cooldown_gas_breath"
 #define COOLDOWN_SIGNALLER_SEND "cooldown_signaller_send"
 #define COOLDOWN_BIKE_FUEL_MESSAGE "cooldown_bikee_fuel_message"
-#define COOLDOWN_WRAITH_PORTAL_TELEPORTED "cooldown_wraith_portal_teleported"
 #define COOLDOWN_ITEM_TRICK "cooldown_item_trick"
 #define COOLDOWN_RAVAGER_FLAMER_ACT "cooldown_ravager_flamer_act"
 #define COOLDOWN_DROPPOD_TARGETTING "cooldown_droppod_targetting"

code/__DEFINES/dcs/signals.dm

@@ -229,7 +229,7 @@
 ///from base of atom/get_mechanics_info(): (/mob)
 #define COMSIG_ATOM_GET_MECHANICS_INFO "atom_mechanics_info"
 	#define COMPONENT_MECHANICS_CHANGE (1<<0)
-	
+
 ///from base of [/atom/proc/update_appearance]: (updates)
 #define COMSIG_ATOM_UPDATE_APPEARANCE "atom_update_appearance"
 	/// If returned from [COMSIG_ATOM_UPDATE_APPEARANCE] it prevents the atom from updating its name.
@@ -678,9 +678,6 @@
 #define COMSIG_XENO_PROJECTILE_HIT "xeno_projectile_hit"			///from [/mob/living/carbon/xenomorph/projectile_hit] called when a projectile hits a xeno but before confirmation of a hit (can miss due to inaccuracy/evasion)
 	#define COMPONENT_PROJECTILE_DODGE (1<<0)
 
-#define COMSIG_XENOMORPH_WRAITH_RECALL "xenomorph_wraith_recall"
-	#define COMPONENT_BANISH_TARGETS_EXIST (1<<0)
-
 #define COMSIG_XENO_PSYCHIC_LINK_REMOVED "xeno_psychic_link_removed"
 
 #define COMSIG_XENOMORPH_LEAP_BUMP "xenomorph_leap_bump" //from /mob/living/carbon/xenomorph/bump

code/__DEFINES/is_helpers.dm

@@ -111,8 +111,6 @@
 #define isxenodefiler(A) (istype(A, /mob/living/carbon/xenomorph/defiler))
 #define isxenobull(A) (istype(A, /mob/living/carbon/xenomorph/bull))
 #define isxenohivemind(A) (istype(A, /mob/living/carbon/xenomorph/hivemind))
-#define isxenowraith(A) (istype(A, /mob/living/carbon/xenomorph/wraith))
-//#define isxenowidow(A) (istype(A, /mob/living/carbon/xenomorph/widow)) //RUTGMC DELETION, WIDOW DELETION
 #define isxenowarlock(A) (istype(A, /mob/living/carbon/xenomorph/warlock))
 #define isxenoking(A) (istype(A, /mob/living/carbon/xenomorph/king))
 #define isxenobehemoth(A) (istype(A, /mob/living/carbon/xenomorph/behemoth))

code/__DEFINES/mobs.dm

@@ -714,36 +714,17 @@ RU TGMC EDIT */
 #define SENTINEL_INTOXICATED_RESIST_REDUCTION 8 //Amount of stacks removed every time the Intoxicated debuff is Resisted against.
 #define SENTINEL_INTOXICATED_SANGUINAL_INCREASE 3 //Amount of debuff stacks applied for every tick of Sanguinal.
 
-//Wraith defines
-
-#define WRAITH_BLINK_DRAG_NONFRIENDLY_MULTIPLIER 20 //The amount we multiply the cooldown by when we teleport while dragging a non-friendly target
-#define WRAITH_BLINK_DRAG_FRIENDLY_MULTIPLIER 4 //The amount we multiply the cooldown by when we teleport while dragging a friendly target
-#define WRAITH_BLINK_RANGE 3
-
-#define WRAITH_BANISH_BASE_DURATION 10 SECONDS
-#define WRAITH_BANISH_NONFRIENDLY_LIVING_MULTIPLIER 0.5
-#define WRAITH_BANISH_VERY_SHORT_MULTIPLIER 0.3
-
-#define WRAITH_TELEPORT_DEBUFF_STAGGER_STACKS 2 SECONDS //Stagger and slow stacks applied to adjacent living hostiles before/after a teleport
-#define WRAITH_TELEPORT_DEBUFF_SLOWDOWN_STACKS 3 //Stagger and slow stacks applied to adjacent living hostiles before/after a teleport
-
 //Larva defines
 #define LARVA_VENT_CRAWL_TIME 1 SECONDS //Larva can crawl into vents fast
 
-/* RUTGMC DELETION, WIDOW DELETION
-//Widow Defines
-#define WIDOW_SPEED_BONUS 1 // How much faster widow moves while she has wall_speedup element
-#define WIDOW_WEB_HOOK_RANGE 10 // how far the web hook can reach
-#define WIDOW_WEB_HOOK_MIN_RANGE 3 // the minimum range that the hook must travel to use the ability
-#define WIDOW_WEB_HOOK_SPEED 3 // how fast widow yeets herself when using web hook
-
-//Spiderling defines
-#define TIME_TO_DISSOLVE 5 SECONDS
-#define SPIDERLING_RAGE_RANGE 10 // how close a nearby human has to be in order to be targeted
-*/
 //Praetorian defines
 #define PRAE_CHARGEDISTANCE 6
 
+// Chimera defines
+//Stagger and slowdown stacks applied to adjacent living hostiles before/after a teleport
+#define CHIMERA_TELEPORT_DEBUFF_STAGGER_STACKS 2 SECONDS
+#define CHIMERA_TELEPORT_DEBUFF_SLOWDOWN_STACKS 3
+
 //misc
 
 #define STANDARD_SLOWDOWN_REGEN 0.3
@@ -837,14 +818,6 @@ GLOBAL_LIST_INIT(human_body_parts, list(BODY_ZONE_HEAD,
 
 #define IGNORE_LOC_CHANGE (IGNORE_USER_LOC_CHANGE|IGNORE_TARGET_LOC_CHANGE)
 
-/* RUTGMC DELETION
-#define TIER_ONE_THRESHOLD 420
-
-#define TIER_TWO_THRESHOLD 840
-
-#define TIER_THREE_THRESHOLD 1750
-*/
-
 // Pheromones and buff orders
 
 #define AURA_XENO_RECOVERY "Recovery"

code/__DEFINES/obj_flags.dm

@@ -12,10 +12,8 @@
 #define XENO_DAMAGEABLE (1<<3) //xenos can damage this by slashing and spitting
 #define DROPSHIP_IMMUNE (1<<4) //dropship cannot land on it
 #define CRUSHER_IMMUNE (1<<5) //is immune to crusher's charge destruction
-#define BANISH_IMMUNE (1<<6) //is immune it wraith's banish ability
-#define PLASMACUTTER_IMMUNE (1<<7) //is immune to being cut by a plasmacutter
-#define PROJECTILE_IMMUNE (1<<8) //Cannot be hit by projectiles
-#define PORTAL_IMMUNE (1<<9) //Cannot be teleported by wraith's portals
+#define PLASMACUTTER_IMMUNE (1<<6) //is immune to being cut by a plasmacutter
+#define PROJECTILE_IMMUNE (1<<7) //Cannot be hit by projectiles
 
 #define RESIST_ALL (UNACIDABLE|INDESTRUCTIBLE|PLASMACUTTER_IMMUNE)
 

code/__DEFINES/traits.dm

@@ -101,7 +101,6 @@
 #define OPTABLE_TRAIT "optable"
 #define TIMESHIFT_TRAIT "timeshift"
 #define BRAIN_TRAIT "brain"
-//#define WIDOW_ABILITY_TRAIT "widow_ability_trait" //RUTGMC DELETION, WIDOW DELETION
 #define PSYCHIC_BLAST_ABILITY_TRAIT "psychic_blast_ability_trait"
 #define PSYCHIC_CRUSH_ABILITY_TRAIT "psychic_crush_ability_trait"
 #define VORTEX_ABILITY_TRAIT "vortex_ability_trait"
@@ -183,7 +182,6 @@
 #define TRAIT_LEGLESS "legless" //Has lost all the appendages needed to stay standing up.
 #define TRAIT_NOPLASMAREGEN "noplasmaregen"//xeno plasma wont recharge
 #define TRAIT_UNDEFIBBABLE "undefibbable"//human can't be revived
-// #define TRAIT_HOLLOW "hollowedout" //examine trait for puppeteer
 #define TRAIT_IMMEDIATE_DEFIB "immediate_defib"//immediately revives when defibbed, rather than just healing
 #define TRAIT_HEALING_INFUSION "healing_infusion"//greatly improves natural healing for xenos
 #define TRAIT_PSY_DRAINED "psy_drained"//mob was drained of life force by a xenos

code/__DEFINES/xeno.dm

@@ -55,12 +55,7 @@
 #define WEAK_ACID_STRENGTH 0.016
 #define REGULAR_ACID_STRENGTH 0.04
 #define STRONG_ACID_STRENGTH 0.1
-/* RU TGMC EDIT
-#define PUPPET_RECALL "recall puppet"
-#define PUPPET_SEEK_CLOSEST "seeking closest and attack order" //not xeno-usable
-#define PUPPET_ATTACK "seek and attack order"
-#define PUPPET_SCOUT "scouting order"
-RU TGMC EDIT*/
+
 //List of weed types
 GLOBAL_LIST_INIT(weed_type_list, typecacheof(list(
 		/obj/alien/weeds/node,
@@ -134,24 +129,6 @@ GLOBAL_LIST_INIT(resin_images_list, list(
 		ALIEN_NEST = image('icons/Xeno/actions.dmi', icon_state = ALIEN_NEST)
 		))
 
-/* RU TGMC EDIT PUPPETEER REMOVAL
-//List of puppeteer order images
-GLOBAL_LIST_INIT(puppeteer_order_images_list, list(
-		PUPPET_ATTACK = image('icons/Xeno/actions.dmi', icon_state = "enrage"),
-		PUPPET_SCOUT = image('icons/mob/actions.dmi', icon_state = "66"),
-		PUPPET_RECALL = image('icons/mob/actions.dmi', icon_state = "rally")
-		))
-RU TGMC EDIT PUPPETEER REMOVAL*/
-//RUTGMC EDIT BEGIN - Moved to modular_RUtgmc\code\__DEFINES\xeno.dm
-/*
-//List of puppeteer pheromone images
-GLOBAL_LIST_INIT(puppeteer_phero_images_list, list(
-		AURA_XENO_BLESSFURY = image('icons/mob/actions.dmi', icon_state = "Fury"),
-		AURA_XENO_BLESSWARDING = image('icons/mob/actions.dmi', icon_state = "Warding"),
-		AURA_XENO_BLESSFRENZY = image('icons/mob/actions.dmi', icon_state = "Frenzy"),
-		))
-*/ //RUTGMC EDIT END
-
 GLOBAL_LIST_INIT(panther_toxin_type_list, list(
 		/datum/reagent/toxin/xeno_hemodile,
 		/datum/reagent/toxin/xeno_transvitox,
@@ -215,6 +192,4 @@ GLOBAL_LIST_INIT(xeno_ai_spawnable, list(
 /// Failed to other blockers such as egg, power plant , coocon , traps
 #define ERROR_CONSTRUCT 8
 
-#define PUPPET_WITHER_RANGE 15
-
 #define PRIMAL_WRATH_GAIN_MULTIPLIER 0.5

code/_globalvars/bitfields.dm

@@ -551,10 +551,8 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"XENO_DAMAGEABLE" = XENO_DAMAGEABLE,
 		"DROPSHIP_IMMUNE" = DROPSHIP_IMMUNE,
 		"CRUSHER_IMMUNE" = CRUSHER_IMMUNE,
-		"BANISH_IMMUNE" = BANISH_IMMUNE,
 		"PLASMACUTTER_IMMUNE" = PLASMACUTTER_IMMUNE,
 		"PROJECTILE_IMMUNE" = PROJECTILE_IMMUNE,
-		"PORTAL_IMMUNE" = PORTAL_IMMUNE
 	),
 	"restrained_flags" = list(
 		"RESTRAINED_XENO_NEST" = RESTRAINED_XENO_NEST,
@@ -601,8 +599,6 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"ABILITY_IGNORE_DEAD_TARGET" = ABILITY_IGNORE_DEAD_TARGET,
 		"ABILITY_IGNORE_SELECTED_ABILITY" = ABILITY_IGNORE_SELECTED_ABILITY,
 		"ABILITY_DO_AFTER_ATTACK" = ABILITY_DO_AFTER_ATTACK,
-		"ABILITY_USE_BURROWED" = ABILITY_USE_BURROWED,
-		"ABILITY_USE_ROOTED" = ABILITY_USE_ROOTED
 	),
 	"pipe_flags" = list(
 		"PIPING_ALL_LAYER" = PIPING_ALL_LAYER,

code/datums/actions/ability_actions.dm

@@ -90,11 +90,6 @@
 			carbon_owner.balloon_alert(carbon_owner, "Cannot, busy")
 		return FALSE
 
-	if(!(flags_to_check & ABILITY_USE_BURROWED) && HAS_TRAIT(carbon_owner, TRAIT_BURROWED))
-		if(!silent)
-			carbon_owner.balloon_alert(carbon_owner, "Cannot while burrowed")
-		return FALSE
-
 	if(!(flags_to_check & ABILITY_USE_CLOSEDTURF) && isclosedturf(get_turf(carbon_owner)))
 		if(!silent)
 			//Not converted to balloon alert as xeno.dm's balloon alert is simultaneously called and will overlap.

code/datums/actions/xeno_action.dm

@@ -37,11 +37,6 @@
 			X.balloon_alert(X, "Cannot while in crest defense")
 		return FALSE
 
-	if(!(flags_to_check & ABILITY_USE_ROOTED) && HAS_TRAIT_FROM(X, TRAIT_IMMOBILE, BOILER_ROOTED_TRAIT))
-		if(!silent)
-			X.balloon_alert(X, "Cannot while rooted")
-		return FALSE
-
 	if(!(flags_to_check & ABILITY_IGNORE_PLASMA) && X.plasma_stored < ability_cost)
 		if(!silent)
 			X.balloon_alert(X, "Need [ability_cost - X.plasma_stored] more plasma")
@@ -83,11 +78,6 @@
 			X.balloon_alert(X, "Cannot while in crest defense")
 		return FALSE
 
-	if(!(flags_to_check & ABILITY_USE_ROOTED) && HAS_TRAIT_FROM(X, TRAIT_IMMOBILE, BOILER_ROOTED_TRAIT))
-		if(!silent)
-			X.balloon_alert(X, "Cannot while rooted")
-		return FALSE
-
 	if(!(flags_to_check & ABILITY_IGNORE_PLASMA) && X.plasma_stored < ability_cost)
 		if(!silent)
 			X.balloon_alert(X, "Need [ability_cost - X.plasma_stored] more plasma")