farewell (tgstation#548)

homexp13 · May 7, 2024 · bdaec5f · bdaec5f
1 parent bb0edde
commit bdaec5f
Show file tree

Hide file tree

Showing 21 changed files with 1 addition and 207 deletions.
diff --git a/code/__DEFINES/action.dm b/code/__DEFINES/action.dm
@@ -22,8 +22,6 @@
 #define VREF_MUTABLE_EMPOWERED_FRAME "VREF_EMPOWERED_FRAME"
 /// A image to show the clock delay ticking.
 #define VREF_IMAGE_XENO_CLOCK "VREF_ACTION_CLOCK"
-/// A reference for baneling's respawn charges
-#define VREF_MUTABLE_BANE_CHARGES "VREF_BANE_CHARGES"
 /// A reference for the build counter of a xeno
 #define VREF_MUTABLE_BUILDING_COUNTER "VREF_BUILD_COUNTER"
 // extra reference for the amount of landslide charges we have

diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
@@ -101,7 +101,6 @@
 #define isxenopraetorian(A) (istype(A, /mob/living/carbon/xenomorph/praetorian))
 #define isxenoravager(A) (istype(A, /mob/living/carbon/xenomorph/ravager))
 #define isxenorunner(A) (istype(A, /mob/living/carbon/xenomorph/runner))
-#define isxenobaneling(A) (istype(A, /mob/living/carbon/xenomorph/baneling))
 #define isxenospitter(A) (istype(A, /mob/living/carbon/xenomorph/spitter))
 #define isxenosentinel(A) (istype(A, /mob/living/carbon/xenomorph/sentinel))
 #define isxenowarrior(A) (istype(A, /mob/living/carbon/xenomorph/warrior))

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
@@ -678,10 +678,6 @@ GLOBAL_LIST_INIT(xenoupgradetiers, list(XENO_UPGRADE_BASETYPE, XENO_UPGRADE_INVA
 //Defender defines
 #define DEFENDER_CHARGE_RANGE 4
 
-//Baneling defines
-/// Not specified in seconds because it causes smoke to last almost four times as long if done so
-#define BANELING_SMOKE_DURATION 4
-
 //Sentinel defines
 #define SENTINEL_TOXIC_SPIT_STACKS_PER 2 //Amount of debuff stacks to be applied per spit.
 #define SENTINEL_TOXIC_SLASH_COUNT 3 //Amount of slashes before the buff runs out

diff --git a/code/__DEFINES/xeno.dm b/code/__DEFINES/xeno.dm
@@ -153,9 +153,6 @@ GLOBAL_LIST_INIT(xeno_ai_spawnable, list(
 	/mob/living/carbon/xenomorph/nymph/ai,
 ))
 
-GLOBAL_LIST_INIT(baneling_spawnable, list(
-	/mob/living/carbon/xenomorph/baneling))
-
 ///Heals a xeno, respecting different types of damage
 #define HEAL_XENO_DAMAGE(xeno, amount, passive) do { \
 	var/fire_loss = xeno.getFireLoss(); \

diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
@@ -88,7 +88,6 @@ GLOBAL_LIST_INIT(genders, list(MALE, FEMALE, NEUTER))
 GLOBAL_LIST_INIT(playable_icons, list(
 	"boiler",
 	"bull",
-	"baneling",
 	"captain",
 	"carrier",
 	"chief_medical",

diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm
@@ -101,8 +101,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/baneling/primordial,
 	/mob/living/carbon/xenomorph/puppeteer,
 	/mob/living/carbon/xenomorph/puppeteer/primordial,
 	/mob/living/carbon/xenomorph/behemoth,

diff --git a/code/datums/keybinding/xeno.dm b/code/datums/keybinding/xeno.dm
@@ -198,13 +198,6 @@
 // Single caste, alphabetical order
 //
 
-/datum/keybinding/xeno/baneling_explode
-	name = "Explode"
-	full_name = "Baneling: Explode"
-	description = "Detonate yourself, spreading your currently selected reagent. Size depends on current stored plasma, more plasma is more reagent."
-	keybind_signal = COMSIG_XENOABILITY_BANELING_EXPLODE
-	hotkey_keys = list("E")
-
 /datum/keybinding/xeno/long_range_sight
 	name = "long_range_sight"
 	full_name = "Boiler: Long Range Sight"

diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
@@ -404,8 +404,6 @@ Status: [status ? status : "Unknown"] | Damage: [health ? health : "None"]
 				newmob = M.change_mob_type(/mob/living/carbon/xenomorph/warrior, location, null, delmob)
 			if("runner")
 				newmob = M.change_mob_type(/mob/living/carbon/xenomorph/runner, location, null, delmob)
-			if("baneling")
-				newmob = M.change_mob_type(/mob/living/carbon/xenomorph/baneling, location, null, delmob)
 			if("drone")
 				newmob = M.change_mob_type(/mob/living/carbon/xenomorph/drone, location, null, delmob)
 			if("sentinel")

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/baneling/abilities_baneling.dm b/code/modules/mob/living/carbon/xenomorph/castes/baneling/abilities_baneling.dm
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/baneling/baneling.dm b/code/modules/mob/living/carbon/xenomorph/castes/baneling/baneling.dm
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/baneling/castedatum_baneling.dm b/code/modules/mob/living/carbon/xenomorph/castes/baneling/castedatum_baneling.dm
diff --git a/code/modules/mob/living/carbon/xenomorph/hive_datum.dm b/code/modules/mob/living/carbon/xenomorph/hive_datum.dm
@@ -21,8 +21,6 @@
 	var/list/obj/structure/xeno/psychictower/psychictowers = list()
 	///list of phero towers
 	var/list/obj/structure/xeno/pherotower/pherotowers = list()
-	///list of baneling pods
-	var/list/obj/structure/xeno/banelingpod/banelingpods = list()
 	///list of hivemind cores
 	var/list/obj/structure/xeno/hivemindcore/hivemindcores = list()
 	var/tier3_xeno_limit
@@ -125,9 +123,6 @@
 	// Hivemind cores
 	for(var/obj/structure/xeno/hivemindcore/core AS in GLOB.hive_datums[hivenumber].hivemindcores)
 		.["hive_structures"] += list(get_structure_packet(core))
-	//Baneling pods
-	for(var/obj/structure/xeno/banelingpod/spawner AS in GLOB.hive_datums[hivenumber].banelingpods)
-		.["hive_structures"] += list(get_structure_packet(spawner))
 	// Spawners
 	for(var/obj/structure/xeno/spawner/spawner AS in GLOB.xeno_spawners_by_hive[hivenumber])
 		.["hive_structures"] += list(get_structure_packet(spawner))

diff --git a/code/modules/mob/living/carbon/xenomorph/hive_upgrades.dm b/code/modules/mob/living/carbon/xenomorph/hive_upgrades.dm
@@ -236,14 +236,6 @@ RU TGMC EDIT */
 	building_loc = 0 //This results in spawning the structure under the user.
 	building_time = 5 SECONDS
 
-/datum/hive_upgrade/building/banelingpod
-	name = "Baneling Pod"
-	desc = "Constructs a pod that generates banelings over time"
-	psypoint_cost = 200
-	icon = "banelingpod"
-	flags_upgrade = ABILITY_NUCLEARWAR
-	building_type = /obj/structure/xeno/banelingpod
-
 /datum/hive_upgrade/building/spawner
 	name = "Spawner"
 	desc = "Constructs a spawner that generates ai xenos over time"

diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
@@ -380,10 +380,6 @@ RU TGMC EDIT */
 	var/fortify = 0
 	var/crest_defense = 0
 
-	// Baneling vars
-	/// Respawn charges, each charge makes respawn take 30 seconds. Maximum of 2 charges. If there is no charge the respawn takes 120 seconds.
-	var/stored_charge = 0
-
 	// *** Ravager vars *** //
 	/// when true the rav will not go into crit or take crit damage.
 	var/endure = FALSE

diff --git a/code/modules/mob/living/carbon/xenomorph/xenoupgrade.dm b/code/modules/mob/living/carbon/xenomorph/xenoupgrade.dm
@@ -382,10 +382,6 @@ RU TGMC EDITION END*/
 
 //----WARLOCK END----//
 //============//
-//----BANELING START----//
-/mob/living/carbon/xenomorph/baneling
-	upgrade = XENO_UPGRADE_NORMAL
-//----BANELING END----//
 //============//
 /*RU TGMC EDIT
 //----PUPPETEER START----//

diff --git a/code/modules/projectiles/ammo_datums.dm b/code/modules/projectiles/ammo_datums.dm
@@ -3769,7 +3769,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh
 	///On a direct hit, how much drowsyness gets added to the target?
 	var/hit_drowsyness = 12
 	///Base spread range
-	var/fixed_spread_range = 3
+	var/fixed_spread_range = 4
 	///Which type is the smoke we leave on passed tiles, provided the projectile has AMMO_LEAVE_TURF enabled?
 	var/passed_turf_smoke_type = /datum/effect_system/smoke_spread/xeno/neuro/light
 	///We're going to reuse one smoke spread system repeatedly to cut down on processing.

diff --git a/code/modules/xenomorph/xeno_structures.dm b/code/modules/xenomorph/xeno_structures.dm
@@ -1287,31 +1287,6 @@ TUNNEL
 			icon_state = "frenzytower"
 			set_light(2, 2, LIGHT_COLOR_RED)
 
-/obj/structure/xeno/banelingpod
-	name = "Baneling pod"
-	desc = "A resin structure filled with an oozing slimy pod that swells constantly. It is filled to the brim with small, crawling figures, merging what seems to be other pods inside."
-	icon = 'icons/Xeno/castes/baneling.dmi'
-	icon_state = "Baneling Pod"
-	bound_width = 32
-	bound_height = 32
-	max_integrity = 100
-	density = FALSE
-	resistance_flags = UNACIDABLE | DROPSHIP_IMMUNE
-	xeno_structure_flags = IGNORE_WEED_REMOVAL | CRITICAL_STRUCTURE
-	var/linked_minions = list()
-
-/obj/structure/xeno/banelingpod/Initialize(mapload, _hivenumber)
-	. = ..()
-	SSminimaps.add_marker(src, MINIMAP_FLAG_XENO, image('modular_RUtgmc/icons/UI_icons/map_blips.dmi', null, "baneling_pod"))
-	SSspawning.registerspawner(src, INFINITY, GLOB.baneling_spawnable, 0, 0, null)
-	SSspawning.spawnerdata[src].required_increment = max(60 SECONDS)/SSspawning.wait
-	SSspawning.spawnerdata[src].max_allowed_mobs = 1
-	GLOB.hive_datums[hivenumber].banelingpods += src
-
-/obj/structure/xeno/banelingpod/Destroy()
-	GLOB.hive_datums[hivenumber].banelingpods -= src
-	return ..()
-
 /obj/structure/xeno/spawner
 	name = "spawner"
 	desc = "A slimy, oozy resin bed filled with foul-looking egg-like ...things."

diff --git a/modular_RUtgmc/code/_globalvars/lists/flavor_misc.dm b/modular_RUtgmc/code/_globalvars/lists/flavor_misc.dm
@@ -5,7 +5,6 @@ GLOBAL_LIST_INIT(playable_icons, list(
 	"behemoth",
 	"boiler",
 	"bull",
-	"baneling",
 	"captain",
 	"clown",
 	"military_police",

diff --git a/modular_RUtgmc/code/modules/mob/living/carbon/xenomorph/castes/baneling/baneling.dm b/modular_RUtgmc/code/modules/mob/living/carbon/xenomorph/castes/baneling/baneling.dm
diff --git a/modular_RUtgmc/includes.dm b/modular_RUtgmc/includes.dm
@@ -174,7 +174,6 @@
 #include "code\modules\mob\living\carbon\xenomorph\xenomorph.dm"
 #include "code\modules\mob\living\carbon\xenomorph\xenoprocs.dm"
 #include "code\modules\mob\living\carbon\xenomorph\xenoupgrade.dm"
-#include "code\modules\mob\living\carbon\xenomorph\castes\baneling\baneling.dm"
 #include "code\modules\mob\living\carbon\xenomorph\castes\behemoth\abilities_behemoth.dm"
 #include "code\modules\mob\living\carbon\xenomorph\castes\behemoth\castedatum_behemoth.dm"
 #include "code\modules\mob\living\carbon\xenomorph\castes\behemoth\behemoth.dm"

diff --git a/tgmc.dme b/tgmc.dme
@@ -1620,9 +1620,6 @@
 #include "code\modules\mob\living\carbon\xenomorph\xenomorph_defense.dm"
 #include "code\modules\mob\living\carbon\xenomorph\xenoprocs.dm"
 #include "code\modules\mob\living\carbon\xenomorph\xenoupgrade.dm"
-#include "code\modules\mob\living\carbon\xenomorph\castes\baneling\abilities_baneling.dm"
-#include "code\modules\mob\living\carbon\xenomorph\castes\baneling\baneling.dm"
-#include "code\modules\mob\living\carbon\xenomorph\castes\baneling\castedatum_baneling.dm"
 #include "code\modules\mob\living\carbon\xenomorph\castes\beetle\abilities_beetle.dm"
 #include "code\modules\mob\living\carbon\xenomorph\castes\beetle\beetle.dm"
 #include "code\modules\mob\living\carbon\xenomorph\castes\beetle\castedatum_beetle.dm"