die (#453)

code/__DEFINES/dcs/signals.dm

@@ -915,7 +915,7 @@
 #define COMSIG_XENOABILITY_PSYCHIC_BLAST "xenoability_psychic_blast"
 #define COMSIG_XENOABILITY_TOGGLE_WARLOCK_ZOOM "xenoability_toggle_warlock_zoom"
 #define COMSIG_XENOABILITY_PSYCHIC_CRUSH "xenoability_psychic_crush"
-
+/* RU TGMC EDIT
 #define COMSIG_XENOABILITY_TENDRILS "xenoability_tendrils"
 #define COMSIG_XENOABILITY_ORGANICBOMB "xenoability_puppeteerorganicbomb"
 #define COMSIG_XENOABILITY_PUPPET "xenoability_puppet"
@@ -927,7 +927,7 @@
 #define COMSIG_XENOABILITY_ATTACKORDER "xenoability_attackorder"
 #define COMSIG_XENOABILITY_RECALLORDER "xenoability_recallorder"
 #define COMSIG_XENOABILITY_BESTOWBLESSINGS "xenoability_giveblessings"
-
+RU TGMC EDIT */
 #define COMSIG_XENOABILITY_BANELING_EXPLODE "xenoability_baneling_explode"
 
 #define COMSIG_XENOABILITY_BEHEMOTH_ROLL "xenoability_behemoth_roll"
@@ -1060,8 +1060,8 @@
 #define COMSIG_SPIDERLING_GUARD "spiderling_guard"
 #define COMSIG_SPIDERLING_UNGUARD "spiderling_unguard"
 */
-
+/* RU TGMC EDIT
 //puppet
 #define COMSIG_PUPPET_CHANGE_ORDER "puppetchangeorder"
 #define COMSIG_PUPPET_CHANGE_ALL_ORDER "puppetglobalorder"
-
+RU TGMC EDIT */

code/__DEFINES/traits.dm

@@ -169,7 +169,7 @@
 #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_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

@@ -42,12 +42,12 @@
 #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,
@@ -123,14 +123,14 @@ GLOBAL_LIST_INIT(resin_images_list, list(
 		RESIN_DOOR = image('icons/Xeno/actions.dmi', icon_state = RESIN_DOOR)
 		))
 */ //RUTGMC EDIT END
-
+/* 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

code/__DEFINES/~RUtgmc_defines/xeno.dm

@@ -45,14 +45,14 @@ GLOBAL_LIST_INIT(resin_images_list, list(
 		RESIN_DOOR = image('modular_RUtgmc/icons/Xeno/actions.dmi', icon_state = RESIN_DOOR),
 		ALIEN_NEST = image('modular_RUtgmc/icons/Xeno/actions.dmi', icon_state = ALIEN_NEST)
 		))
-
+/* RU TGMC EDIT
 //List of puppeteer pheromone images
 GLOBAL_LIST_INIT(puppeteer_phero_images_list, list(
 		AURA_XENO_BLESSFURY = image('modular_RUtgmc/icons/Xeno/actions.dmi', icon_state = "Fury"),
 		AURA_XENO_BLESSWARDING = image('modular_RUtgmc/icons/Xeno/actions.dmi', icon_state = "Warding"),
 		AURA_XENO_BLESSFRENZY = image('modular_RUtgmc/icons/Xeno/actions.dmi', icon_state = "Frenzy"),
 		))
-
+RU TGMC EDIT*/
 GLOBAL_LIST_INIT(panther_toxin_type_list, list(
 		/datum/reagent/toxin/xeno_hemodile,
 		/datum/reagent/toxin/xeno_transvitox,

code/datums/keybinding/xeno.dm

@@ -1055,7 +1055,7 @@
 	keybind_signal = COMSIG_XENOABILITY_TIMESTOP
 	hotkey_keys = list("V")
 RU TGMC EDIT END*/
-
+/*RU TGMC EDIT PUPPETEER REMOVAL
 /datum/keybinding/xeno/flay
 	name = "Flay"
 	full_name = "Puppeteer: Flay"
@@ -1121,7 +1121,7 @@ RU TGMC EDIT END*/
 	full_name = "Puppeteer: Bestow Blessings"
 	description = "Give blessings to your puppets."
 	keybind_signal = COMSIG_XENOABILITY_BESTOWBLESSINGS
-
+RU TGMC EDIT PUPPETEER REMOVAL*/
 /* RUTGMC DELETION
 /datum/keybinding/xeno/behemoth_roll
 	name = "Roll"

code/datums/status_effects/xeno_buffs.dm

@@ -826,7 +826,7 @@
 	scale = 0.6
 	rotation = 0
 	spin = 0
-
+/* RU TGMC EDIT
 // ***************************************
 // *********** Blessings
 // ***************************************
@@ -902,3 +902,4 @@
 	buff_owner.soft_armor = buff_owner.soft_armor.detachArmor(armor_modifier)
 	armor_modifier = null
 	return ..()
+RU TGMC EDIT */

code/modules/admin/topic.dm

@@ -448,8 +448,10 @@ Status: [status ? status : "Unknown"] | Damage: [health ? health : "None"]
 			if("wraith")
 				newmob = M.change_mob_type(/mob/living/carbon/xenomorph/wraith, location, null, delmob)
 			RU TGMC EDIT END */
+			/*RU TGMC EDIT
 			if("puppeteer")
 				newmob = M.change_mob_type(/mob/living/carbon/xenomorph/puppeteer, location, null, delmob)
+			RU TGMC EDIT*/
 			if("behemoth")
 				newmob = M.change_mob_type(/mob/living/carbon/xenomorph/behemoth, location, null, delmob)
 			if("human")

code/modules/ai/ai_behaviors/xeno/puppet.dm

@@ -1,3 +1,4 @@
+/* RU TGMC EDIT
 /datum/ai_behavior/puppet
 	target_distance = 7
 	base_action = IDLE
@@ -183,3 +184,4 @@
 		return
 	if(feed.ai_should_use(target))
 		feed.use_ability(target)
+RU TGMC EDIT*/

code/modules/mob/living/carbon/human/examine.dm

@@ -488,13 +488,13 @@
 				msg += "<a href='?src=[text_ref(src)];squadfireteam=1'>\[Assign to a fireteam.\]</a>\n"
 
 	msg += "[flavor_text]<br>"
-
+/* RU TGMC EDIT PUPPETEER REMOVAL
 	if(HAS_TRAIT(src, TRAIT_HOLLOW))
 		if(isxeno(user))
 			msg += "<span style='font-weight: bold; color: purple;'>[t_He] [t_is] hollow. Useless.</span>\n"
 		else
 			msg += "[span_warning("<b>[t_He] [t_is] hollowed out!</b>")]\n"
-
+RU TGMC EDIT PUPPETEER REMOVAL */
 	if(isxeno(user))
 		if(species.species_flags & IS_SYNTHETIC)
 			msg += "[span_xenowarning("You sense [t_he] [t_is] not organic.")]\n"

code/modules/mob/living/carbon/xenomorph/castes/defender/castedatum_defender.dm

@@ -26,13 +26,13 @@
 	// *** Evolution *** //
 	evolution_threshold = 100
 	// upgrade_threshold = TIER_ONE_THRESHOLD // RUTGMC DELETION
-
+/* RU TGMC EDIT
 	evolves_to = list(
 		/mob/living/carbon/xenomorph/warrior,
 		/mob/living/carbon/xenomorph/bull,
 		/mob/living/carbon/xenomorph/puppeteer,
 	)
-
+RU TGMC EDIT*/
 	// *** Flags *** //
 	caste_flags = CASTE_EVOLUTION_ALLOWED
 	can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER

code/modules/mob/living/carbon/xenomorph/castes/puppet/abilities_puppet.dm

@@ -1,3 +1,4 @@
+/*RU TGMC EDIT
 /datum/action/ability/activable/xeno/feed
 	name = "Feed"
 	action_icon_state = "lunge"
@@ -24,3 +25,4 @@
 		return FALSE
 	if(!owner.Adjacent(target))
 		return FALSE
+RU TGMC EDIT*/

code/modules/mob/living/carbon/xenomorph/castes/puppet/castedatum_puppet.dm

@@ -1,3 +1,4 @@
+/*RU TGMC EDIT
 /datum/xeno_caste/puppet
 	caste_name = "Puppet"
 	display_name = "Puppet"
@@ -22,3 +23,4 @@
 		/datum/action/ability/xeno_action/xeno_resting,
 		/datum/action/ability/activable/xeno/feed,
 	)
+RU TGMC EDIT*/

code/modules/mob/living/carbon/xenomorph/castes/puppet/puppet.dm

@@ -1,3 +1,4 @@
+/*RU TGMC EDIT
 /mob/living/carbon/xenomorph/puppet
 	caste_base_type = /mob/living/carbon/xenomorph/puppet
 	name = "Puppet"
@@ -64,3 +65,4 @@
 	for(var/datum/status_effect/effect AS in status_effects)
 		if(istype(effect, /datum/status_effect/blessing))
 			holder.overlays += image('icons/mob/hud.dmi', icon_state = initial(effect.id))
+RU TGMC EDIT*/

code/modules/mob/living/carbon/xenomorph/castes/puppeteer/abilities_puppeteer.dm

@@ -1,3 +1,4 @@
+/* RUTGMC EDIT
 // ***************************************
 // *********** Flay
 // ***************************************
@@ -523,3 +524,4 @@
 	return FALSE
 
 
+RU TGMC EDIT*/

code/modules/mob/living/carbon/xenomorph/castes/puppeteer/castedatum_puppeteer.dm

@@ -1,3 +1,4 @@
+/*RU TGMC EDIT
 /datum/xeno_caste/puppeteer
 	caste_name = "Puppeteer"
 	display_name = "Puppeteer"
@@ -80,3 +81,4 @@
 	)
 
 	aura_strength = 3
+RU TGMC EDIT*/

code/modules/mob/living/carbon/xenomorph/castes/puppeteer/puppeteer.dm

@@ -1,3 +1,4 @@
+/*RU TGMC EDIT
 /mob/living/carbon/xenomorph/puppeteer
 	caste_base_type = /mob/living/carbon/xenomorph/puppeteer
 	name = "Puppeteer"
@@ -25,3 +26,4 @@
 		return
 	plasma_stored = min(plasma_stored + round(damage / 0.8), xeno_caste.plasma_max)
 	SEND_SIGNAL(src, COMSIG_PUPPET_CHANGE_ALL_ORDER, PUPPET_ATTACK, target) //we are on harm intent so it probably means we want to kill the target
+RU TGMC EDIT*/

code/modules/mob/living/carbon/xenomorph/xeno_defines.dm

@@ -153,11 +153,11 @@
 	var/fortify_armor = 0
 	///amount of slowdown to apply when the crest defense is active. trading defense for speed. Positive numbers makes it slower.
 	var/crest_defense_slowdown = 0
-
+/* RU TGMC EDIT
 	// *** Puppeteer Abilities *** //
 	var/flay_plasma_gain = 0
 	var/max_puppets = 0
-
+RU TGMC EDIT */
 	// *** Crusher Abilities *** //
 	///The damage the stomp causes, counts armor
 	var/stomp_damage = 0

code/modules/mob/living/carbon/xenomorph/xenoupgrade.dm

@@ -387,6 +387,7 @@ RU TGMC EDITION END*/
 	upgrade = XENO_UPGRADE_NORMAL
 //----BANELING END----//
 //============//
+/*RU TGMC EDIT
 //----PUPPETEER START----//
 /mob/living/carbon/xenomorph/puppeteer
 	upgrade = XENO_UPGRADE_NORMAL
@@ -396,6 +397,7 @@ RU TGMC EDITION END*/
 	//upgrade_stored = TIER_TWO_THRESHOLD // RUTGMC DELETION
 
 //----PUPPETEER END----//
+RU TGMC EDIT*/
 //============//
 //----BEHEMOTH START----//
 

code/modules/projectiles/ammo_datums.dm

@@ -4045,7 +4045,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh
 /datum/ammo/xeno/leash_ball/proc/drop_leashball(turf/T)
 	new /obj/structure/xeno/aoe_leash(get_turf(T), hivenumber)
 */
-
+/* RU TGMC EDIT
 /datum/ammo/xeno/spine //puppeteer
 	name = "spine"
 	damage = 35
@@ -4054,7 +4054,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh
 	bullet_color = COLOR_WHITE
 	sound_hit = 'sound/bullets/spear_armor1.ogg'
 	flags_ammo_behavior = AMMO_XENO|AMMO_SKIPS_ALIENS
-
+RU TGMC EDIT*/
 /*
 //================================================
 					Misc Ammo

modular_RUtgmc/code/_globalvars/lists/flavor_misc.dm

@@ -30,7 +30,6 @@ GLOBAL_LIST_INIT(playable_icons, list(
 	"pilot",
 	"praetorian",
 	"private",
-	"puppeteer",
 	"ravager",
 	"requisition",
 	"researcher",

modular_RUtgmc/code/_globalvars/lists/mobs.dm

@@ -41,9 +41,6 @@ GLOBAL_LIST_INIT(all_xeno_types, list(
 	/mob/living/carbon/xenomorph/shrike/primordial,
 	/mob/living/carbon/xenomorph/warlock,
 	/mob/living/carbon/xenomorph/warlock/primordial,
-	/mob/living/carbon/xenomorph/baneling,
-	/mob/living/carbon/xenomorph/puppeteer,
-	/mob/living/carbon/xenomorph/puppeteer/primordial,
 	/mob/living/carbon/xenomorph/behemoth,
 	/mob/living/carbon/xenomorph/behemoth/primordial,
 	/mob/living/carbon/xenomorph/chimera,
@@ -54,7 +51,7 @@ GLOBAL_LIST_INIT(all_xeno_types, list(
 	/mob/living/carbon/xenomorph/facehugger,
 	))
 
-GLOBAL_LIST_INIT(xeno_types_tier_two, list(/mob/living/carbon/xenomorph/hunter, /mob/living/carbon/xenomorph/panther, /mob/living/carbon/xenomorph/warrior, /mob/living/carbon/xenomorph/spitter, /mob/living/carbon/xenomorph/hivelord, /mob/living/carbon/xenomorph/carrier, /mob/living/carbon/xenomorph/bull, /mob/living/carbon/xenomorph/puppeteer))
+GLOBAL_LIST_INIT(xeno_types_tier_two, list(/mob/living/carbon/xenomorph/hunter, /mob/living/carbon/xenomorph/panther, /mob/living/carbon/xenomorph/warrior, /mob/living/carbon/xenomorph/spitter, /mob/living/carbon/xenomorph/hivelord, /mob/living/carbon/xenomorph/carrier, /mob/living/carbon/xenomorph/bull))
 GLOBAL_LIST_INIT(xeno_types_tier_three, list(/mob/living/carbon/xenomorph/gorger, /mob/living/carbon/xenomorph/ravager, /mob/living/carbon/xenomorph/praetorian, /mob/living/carbon/xenomorph/boiler, /mob/living/carbon/xenomorph/defiler, /mob/living/carbon/xenomorph/crusher, /mob/living/carbon/xenomorph/shrike, /mob/living/carbon/xenomorph/behemoth, /mob/living/carbon/xenomorph/chimera))
 
 GLOBAL_LIST_INIT(forbid_excepts, list(

modular_RUtgmc/code/modules/admin/panels/player_panel.dm

@@ -126,7 +126,6 @@
 		<a href='?src=[ref];transform=spitter;mob=[REF(M)]'>Spitter</a> |
 		<a href='?src=[ref];transform=hivelord;mob=[REF(M)]'>Hivelord</a> |
 		<a href='?src=[ref];transform=carrier;mob=[REF(M)]'>Carrier</a> |
-		<a href='?src=[ref];transform=puppeteer;mob=[REF(M)]'>Puppeteer</a> |
 		<br> Alien Tier 3:
 		<a href='?src=[ref];transform=ravager;mob=[REF(M)]'>Ravager</a> |
 		<a href='?src=[ref];transform=praetorian;mob=[REF(M)]'>Praetorian</a> |

modular_RUtgmc/code/modules/mob/living/carbon/xenomorph/castes/defender/castedatum_defender.dm

@@ -1,5 +1,10 @@
 /datum/xeno_caste/defender
 
+	evolves_to = list(
+		/mob/living/carbon/xenomorph/warrior,
+		/mob/living/carbon/xenomorph/bull,
+	)
+
 	deevolves_to = /mob/living/carbon/xenomorph/larva
 
 	// *** Flags *** //

modular_RUtgmc/code/modules/mob/living/carbon/xenomorph/castes/warlock/castedatum_warlock.dm

@@ -1,2 +1,2 @@
 /datum/xeno_caste/warlock
-	deevolves_to = list(/mob/living/carbon/xenomorph/warrior, /mob/living/carbon/xenomorph/puppeteer)
+	deevolves_to = list(/mob/living/carbon/xenomorph/warrior)

modular_RUtgmc/includes.dm

@@ -219,14 +219,9 @@
 #include "code\modules\mob\living\carbon\xenomorph\castes\praetorian\abilities_praetorian.dm"
 #include "code\modules\mob\living\carbon\xenomorph\castes\praetorian\castedatum_praetorian.dm"
 #include "code\modules\mob\living\carbon\xenomorph\castes\praetorian\praetorian.dm"
-#include "code\modules\mob\living\carbon\xenomorph\castes\puppeteer\puppeteer.dm"
-#include "code\modules\mob\living\carbon\xenomorph\castes\puppeteer\abilities_puppeteer.dm"
-#include "code\modules\mob\living\carbon\xenomorph\castes\puppet\puppet.dm"
-#include "code\modules\mob\living\carbon\xenomorph\castes\puppet\castedatum_puppet.dm"
 // #include "code\modules\mob\living\carbon\xenomorph\castes\predalien\castedatum_predalien.dm"
 // #include "code\modules\mob\living\carbon\xenomorph\castes\predalien\predalien.dm"
 // #include "code\modules\mob\living\carbon\xenomorph\castes\predalien\abilities_predalien.dm"
-#include "code\modules\mob\living\carbon\xenomorph\castes\puppeteer\castedatum_puppeteer.dm"
 #include "code\modules\mob\living\carbon\xenomorph\castes\queen\abilities_queen.dm"
 #include "code\modules\mob\living\carbon\xenomorph\castes\queen\castedatum_queen.dm"
 #include "code\modules\mob\living\carbon\xenomorph\castes\queen\queen.dm"