diff --git a/code/__DEFINES/action.dm b/code/__DEFINES/action.dm index 2776c63340c64..95df0aee6810e 100644 --- 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 index 23b0e4f267274..32ecac558c7f5 100755 --- 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 index d69ee46a60572..5ff0b69bd185d 100644 --- 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 index 669057e74d9dc..a82b6465d174a 100644 --- 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 index f5dc15547d480..b70e18677cb1c 100644 --- 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 index 4249f7f778268..845fe4d2eaa7d 100644 --- 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 index 899c3286ad6f5..45726c862f9cc 100644 --- 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 index 313ae5643af1d..430f4dd31202d 100644 --- 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 deleted file mode 100644 index 13130f4ab4b93..0000000000000 --- a/code/modules/mob/living/carbon/xenomorph/castes/baneling/abilities_baneling.dm +++ /dev/null @@ -1,38 +0,0 @@ -// *************************************** -// *********** Baneling Explode -// *************************************** -/datum/action/ability/xeno_action/baneling_explode - name = "Baneling Explode" - action_icon_state = "baneling_explode" - desc = "Explode and spread dangerous toxins to hinder or kill your foes. You will respawn in your pod after you detonate, should your pod be planted. By staying alive, you gain charges to respawn quicker." - keybinding_signals = list( - KEYBINDING_NORMAL = COMSIG_XENOABILITY_BANELING_EXPLODE, - ) - -/datum/action/ability/xeno_action/baneling_explode/action_activate() - . = ..() - var/mob/living/carbon/xenomorph/X = owner - var/turf/owner_T = get_turf(X) - var/datum/effect_system/smoke_spread/xeno/smoke - smoke = new /datum/effect_system/smoke_spread/xeno/acid - var/smoke_range = 5 - smoke.set_up(smoke_range, owner_T, BANELING_SMOKE_DURATION) - playsound(owner_T, 'sound/effects/blobattack.ogg', 25) - smoke.start() - X.gib(FALSE) - X.record_war_crime() - -/datum/action/ability/xeno_action/baneling_explode/ai_should_start_consider() - return TRUE - -/datum/action/ability/xeno_action/baneling_explode/ai_should_use(atom/target) - var/range = 1 - if(!iscarbon(target)) - return FALSE - if(!line_of_sight(owner, target, range)) - return FALSE - if(!can_use_action(override_flags = ABILITY_IGNORE_SELECTED_ABILITY)) - return FALSE - if(target.get_xeno_hivenumber() == owner.get_xeno_hivenumber()) - return FALSE - return TRUE diff --git a/code/modules/mob/living/carbon/xenomorph/castes/baneling/baneling.dm b/code/modules/mob/living/carbon/xenomorph/castes/baneling/baneling.dm deleted file mode 100644 index a8d39431329d5..0000000000000 --- a/code/modules/mob/living/carbon/xenomorph/castes/baneling/baneling.dm +++ /dev/null @@ -1,49 +0,0 @@ -/mob/living/carbon/xenomorph/baneling - caste_base_type = /mob/living/carbon/xenomorph/baneling - name = "Baneling" - desc = "An oozy, squishy alien that can roll in agile speeds, storing various dangerous chemicals in its sac..." - icon = 'icons/Xeno/castes/baneling.dmi' - icon_state = "Baneling Walking" - bubble_icon = "alienleft" - health = 100 - maxHealth = 100 - plasma_stored = 50 - tier = XENO_TIER_MINION - upgrade = XENO_UPGRADE_BASETYPE - gib_chance = 100 - pixel_x = -16 - old_x = -16 - var/datum/effect_system/smoke_spread/xeno/smoke - -/mob/living/carbon/xenomorph/baneling/UnarmedAttack(atom/A, has_proximity, modifiers) - /// We dont wanna be able to slash while balling - if(m_intent == MOVE_INTENT_RUN) - return - return ..() - -/mob/living/carbon/xenomorph/baneling/Initialize(mapload) - . = ..() - smoke = new /datum/effect_system/smoke_spread/xeno/acid(src) - AddComponent(/datum/component/ai_controller, /datum/ai_behavior/xeno) - RegisterSignal(src, COMSIG_XENOMORPH_GIBBING, PROC_REF(gib_explode)) - -/mob/living/carbon/xenomorph/baneling/proc/gib_explode() - SIGNAL_HANDLER - visible_message(span_danger("[src] begins to bulge grotesquely, and explodes in a cloud of corrosive gas!")) - smoke.set_up(1, get_turf(src)) - smoke.start() - -// *************************************** -// *********** Icon -// *************************************** -/mob/living/carbon/xenomorph/baneling/handle_special_state() - . = ..() - if(m_intent == MOVE_INTENT_RUN) - icon_state = "[xeno_caste.caste_name][is_a_rouny ? " rouny" : ""] Running" - return TRUE - return FALSE - -/mob/living/carbon/xenomorph/baneling/handle_special_wound_states(severity) - . = ..() - if(m_intent == MOVE_INTENT_RUN) - return "wounded_running_[severity]" 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 deleted file mode 100644 index 16bc9ec01c0db..0000000000000 --- a/code/modules/mob/living/carbon/xenomorph/castes/baneling/castedatum_baneling.dm +++ /dev/null @@ -1,40 +0,0 @@ -/datum/xeno_caste/baneling - caste_name = "Baneling" - display_name = "Baneling" - upgrade_name = "" - caste_desc = "Gross, cute, bloated and ready to explode!" - caste_type_path = /mob/living/carbon/xenomorph/baneling - tier = XENO_TIER_MINION - upgrade = XENO_UPGRADE_BASETYPE - wound_type = "baneling" //used to match appropriate wound overlays - - gib_flick = "baneling_gibbed" - - // *** Melee Attacks *** // - melee_damage = 16 - attack_delay = 6 - - // *** Speed *** // - speed = -1.6 - - // *** Health *** // - max_health = 100 - crit_health = 0 - - - // *** Flags *** // - caste_flags = CASTE_DO_NOT_ALERT_LOW_LIFE|CASTE_IS_A_MINION - can_flags = CASTE_CAN_BE_QUEEN_HEALED - caste_traits = null - - // *** Defense *** // - soft_armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 20, BIO = 20, FIRE = 15, ACID = 100) - - // *** Minimap Icon *** // - minimap_icon = "baneling" - - // *** Abilities *** /// - actions = list( - /datum/action/ability/xeno_action/xeno_resting, - /datum/action/ability/xeno_action/baneling_explode, - ) diff --git a/code/modules/mob/living/carbon/xenomorph/hive_datum.dm b/code/modules/mob/living/carbon/xenomorph/hive_datum.dm index 6408a480ad664..7b8a7b22d1282 100644 --- 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 index 3f6a6e16573fb..8843d0f67fc15 100644 --- 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 index 3d78e75bb757c..4661ba6e00bd3 100644 --- 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 index 464490e604c0d..c642082b6cb48 100644 --- 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 index 8602d8a48b16a..5cf59ed867aec 100644 --- 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 index efa98500431b8..80bb255436b34 100644 --- 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 index 0763d28bae1a1..cdfed1b7406b9 100644 --- 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 deleted file mode 100644 index d76bbbcddbcf1..0000000000000 --- a/modular_RUtgmc/code/modules/mob/living/carbon/xenomorph/castes/baneling/baneling.dm +++ /dev/null @@ -1,6 +0,0 @@ -/mob/living/carbon/xenomorph/baneling - bubble_icon = "alien" - -/obj/structure/xeno/baneling_pod - icon = 'modular_RUtgmc/icons/Xeno/castes/baneling.dmi' - plane = FLOOR_PLANE diff --git a/modular_RUtgmc/includes.dm b/modular_RUtgmc/includes.dm index 97e811b68f38d..1746bfe7b3e27 100644 --- 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 index b3ed2719a8785..671703d520f87 100644 --- 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"