Linter

cmss13-devs · May 26, 2024 · d23f4af · d23f4af
1 parent 310a0aa
commit d23f4af
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 38 deletions.
diff --git a/code/modules/cm_aliens/XenoStructures.dm b/code/modules/cm_aliens/XenoStructures.dm
@@ -855,12 +855,22 @@
 	var/mob/chosen_candidate
 
 /obj/effect/alien/resin/destroyer_cocoon/Initialize(mapload, pylon)
-	..()
+	. = ..()
 	timer = addtimer(CALLBACK(src, PROC_REF(start_growing)), 10 SECONDS, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_DELETE_ME)
+	addtimer(CALLBACK(src, PROC_REF(check_pylons)), 10 SECONDS, TIMER_UNIQUE)
+
+/obj/effect/alien/resin/destroyer_cocoon/proc/check_pylons()
+	var/datum/hive_status/hive = GLOB.hive_datum[XENO_HIVE_NORMAL]
+
+	if(hive.active_endgame_pylons.len < 2)
+		qdel(src)
+
+	addtimer(CALLBACK(src, PROC_REF(check_pylons)), 10 SECONDS, TIMER_UNIQUE)
+
 
 /obj/effect/alien/resin/destroyer_cocoon/proc/start_growing()
 	icon_state = "growing"
-	addtimer(CALLBACK(src, PROC_REF(choose_candidate)), 9 MINUTES SECONDS, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_DELETE_ME)
+	timer = addtimer(CALLBACK(src, PROC_REF(choose_candidate)), 9 MINUTES SECONDS, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_DELETE_ME)
 
 /obj/effect/alien/resin/destroyer_cocoon/proc/roll_candidates()
 	// First, Let the Queen choose
@@ -910,12 +920,12 @@
 /obj/effect/alien/resin/destroyer_cocoon/proc/choose_candidate()
 	chosen_candidate = roll_candidates()
 
-	addtimer(CALLBACK(src, PROC_REF(animate_hatch_destroyer)), 1 MINUTES, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_DELETE_ME)
+	timer = addtimer(CALLBACK(src, PROC_REF(animate_hatch_destroyer)), 1 MINUTES, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_DELETE_ME)
 
 /obj/effect/alien/resin/destroyer_cocoon/proc/animate_hatch_destroyer()
 	flick("hatching", src)
 
-	addtimer(CALLBACK(src, PROC_REF(hatch_destroyer)), 2 SECONDS, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_DELETE_ME)
+	addtimer(CALLBACK(src, PROC_REF(hatch_destroyer)), 2 SECONDS, TIMER_UNIQUE|TIMER_STOPPABLE)
 
 /obj/effect/alien/resin/destroyer_cocoon/proc/hatch_destroyer()
 	var/mob/living/carbon/xenomorph/destroyer/destroyer = new(locate(src.x + 2, src.y + 2, src.z))

diff --git a/code/modules/cm_aliens/hivebuffs/hivebuff.dm b/code/modules/cm_aliens/hivebuffs/hivebuff.dm
@@ -350,6 +350,7 @@
 
 	engage_flavourmessage = "The Queen has purchased 5 extra larva to join the hive!"
 	cost = 5
+	number_of_required_pylons = 1
 	is_reusable = FALSE
 
 /datum/hivebuff/extra_larva/on_engage()
@@ -358,11 +359,11 @@
 
 /datum/hivebuff/extra_life
 	name = "Boon of Plenty"
-	desc = "Increases all xenomorph health by 10% for 10 seconds"
+	desc = "Increases all xenomorph health by 5% for 10 seconds"
 	tier = HIVEBUFF_TIER_MINOR
 	engage_flavourmessage = "The Queen has imbued us with greater fortitude."
 	duration = 10 SECONDS
-	number_of_required_pylons = 2
+	number_of_required_pylons = 1
 
 /datum/hivebuff/extra_life/apply_buff_effects(mob/living/carbon/xenomorph/xeno)
 	xeno.maxHealth *= 1.05
@@ -377,15 +378,24 @@
 
 	engage_flavourmessage = "The Queen has imbued us with greater fortitude."
 	duration = 10 MINUTES
+	cost = 2
 	number_of_required_pylons = 2
 	radial_icon = "health_m"
 
+/datum/hivebuff/extra_life/major/apply_buff_effects(mob/living/carbon/xenomorph/xeno)
+	xeno.maxHealth *= 1.1
+
+/datum/hivebuff/extra_life/major/remove_buff_effects(mob/living/carbon/xenomorph/xeno)
+	xeno.maxHealth = initial(xeno.caste.max_health)
+
 /datum/hivebuff/game_ender_caste
 	name = "Boon of Destruction"
 	desc = "A huge behemoth of a Xenomorph which can tear its way through defences and flesh alike."
 	tier = HIVEBUFF_TIER_MAJOR
 	is_unique = TRUE
-	is_reusable = FALSE
+	is_reusable = TRUE
+	cost = 10
+	number_of_required_pylons = 2
 
 /datum/hivebuff/game_ender_caste/on_engage(obj/effect/alien/resin/special/pylon/purchased_pylon)
 	var/turf/spawn_turf
@@ -437,6 +447,7 @@
 
 	engage_flavourmessage = "The Queen has imbued us with even greater chitin."
 	duration = 10 MINUTES
+	cost = 2
 	number_of_required_pylons = 2
 	radial_icon = "shield_m"
 
@@ -472,6 +483,7 @@
 	engage_flavourmessage = "The Queen has imbued us with razer sharp claws."
 	duration = 10 MINUTES
 	number_of_required_pylons = 2
+	cost = 2
 	radial_icon = "slash_m"
 
 /datum/hivebuff/attack/major/apply_buff_effects(mob/living/carbon/xenomorph/xeno)

diff --git a/code/modules/cm_aliens/structures/special/pylon_core.dm b/code/modules/cm_aliens/structures/special/pylon_core.dm
@@ -139,6 +139,7 @@
 
 /obj/effect/alien/resin/special/pylon/endgame
 	cover_range = WEED_RANGE_CORE
+	protection_level = TURF_PROTECTION_OB
 	var/activated = FALSE
 
 	/// Hivebuff being sustained by this pylon

diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/destroyer/destroyer_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/destroyer/destroyer_powers.dm
@@ -40,7 +40,7 @@
 
 	playsound(xeno.loc, 'sound/voice/deep_alien_screech2.ogg', 75, 0, status = 0)
 	xeno.visible_message(SPAN_XENOHIGHDANGER("[xeno] emits an raspy guttural roar!"))
-	xeno.create_shriekwave(color = COLOR_RED) //Adds the visual effect.
+	xeno.create_shriekwave()
 
 	var/datum/effect_system/smoke_spread/destroyer_doom/smoke_gas = new /datum/effect_system/smoke_spread/destroyer_doom
 	smoke_gas.set_up(3, 0, get_turf(xeno), null, 6)

diff --git a/colonialmarines.dme b/colonialmarines.dme
@@ -101,7 +101,6 @@
 #include "code\__DEFINES\stamina.dm"
 #include "code\__DEFINES\stats.dm"
 #include "code\__DEFINES\status_effects.dm"
-#include "code\__DEFINES\strippable.dm"
 #include "code\__DEFINES\STUI.dm"
 #include "code\__DEFINES\subsystems.dm"
 #include "code\__DEFINES\supply.dm"
@@ -174,7 +173,6 @@
 #include "code\__HELPERS\guid.dm"
 #include "code\__HELPERS\icons.dm"
 #include "code\__HELPERS\job.dm"
-#include "code\__HELPERS\lazy_templates.dm"
 #include "code\__HELPERS\level_traits.dm"
 #include "code\__HELPERS\lighting.dm"
 #include "code\__HELPERS\lists.dm"
@@ -346,7 +344,6 @@
 #include "code\datums\fluff_emails.dm"
 #include "code\datums\global_variables.dm"
 #include "code\datums\http.dm"
-#include "code\datums\lazy_template.dm"
 #include "code\datums\map_config.dm"
 #include "code\datums\matrix_editor.dm"
 #include "code\datums\medal_awards.dm"
@@ -382,7 +379,6 @@
 #include "code\datums\ammo\rocket.dm"
 #include "code\datums\ammo\shrapnel.dm"
 #include "code\datums\ammo\xeno.dm"
-#include "code\datums\ammo\bullet\arc.dm"
 #include "code\datums\ammo\bullet\bullet.dm"
 #include "code\datums\ammo\bullet\lever_action.dm"
 #include "code\datums\ammo\bullet\pistol.dm"
@@ -405,7 +401,6 @@
 #include "code\datums\components\cluster_stack.dm"
 #include "code\datums\components\connect_mob_behalf.dm"
 #include "code\datums\components\crate_tag.dm"
-#include "code\datums\components\disk_reader.dm"
 #include "code\datums\components\footstep.dm"
 #include "code\datums\components\healing_reduction.dm"
 #include "code\datums\components\id_lock.dm"
@@ -487,7 +482,6 @@
 #include "code\datums\elements\light_blocking.dm"
 #include "code\datums\elements\mouth_drop_item.dm"
 #include "code\datums\elements\poor_eyesight_correction.dm"
-#include "code\datums\elements\strippable.dm"
 #include "code\datums\elements\suturing.dm"
 #include "code\datums\elements\yautja_tracked_item.dm"
 #include "code\datums\elements\bullet_trait\damage_boost.dm"
@@ -496,7 +490,6 @@
 #include "code\datums\elements\bullet_trait\incendiary.dm"
 #include "code\datums\elements\bullet_trait\penetrating\heavy.dm"
 #include "code\datums\elements\bullet_trait\penetrating\penetrating.dm"
-#include "code\datums\elements\bullet_trait\penetrating\weak.dm"
 #include "code\datums\elements\traitbound\_traitbound.dm"
 #include "code\datums\elements\traitbound\crawler.dm"
 #include "code\datums\elements\traitbound\gun_silenced.dm"
@@ -515,7 +508,6 @@
 #include "code\datums\emergency_calls\deus_vult.dm"
 #include "code\datums\emergency_calls\dutch.dm"
 #include "code\datums\emergency_calls\emergency_call.dm"
-#include "code\datums\emergency_calls\ert_stations.dm"
 #include "code\datums\emergency_calls\feral_xenos.dm"
 #include "code\datums\emergency_calls\forsaken_xenos.dm"
 #include "code\datums\emergency_calls\goons.dm"
@@ -633,7 +625,6 @@
 #include "code\datums\skills\synthetic.dm"
 #include "code\datums\skills\upp.dm"
 #include "code\datums\skills\uscm.dm"
-#include "code\datums\skills\wygoons.dm"
 #include "code\datums\stamina\_stamina.dm"
 #include "code\datums\stamina\none.dm"
 #include "code\datums\statistics\cause_data.dm"
@@ -679,7 +670,6 @@
 #include "code\datums\supply_packs\restricted_equipment.dm"
 #include "code\datums\supply_packs\spec_ammo.dm"
 #include "code\datums\supply_packs\vehicle_ammo.dm"
-#include "code\datums\supply_packs\vehicle_equipment.dm"
 #include "code\datums\supply_packs\weapons.dm"
 #include "code\datums\tutorial\_tutorial.dm"
 #include "code\datums\tutorial\_tutorial_menu.dm"
@@ -796,10 +786,9 @@
 #include "code\game\jobs\job\civilians\support\working_joe.dm"
 #include "code\game\jobs\job\command\command.dm"
 #include "code\game\jobs\job\command\auxiliary\auxiliary_support_officer.dm"
-#include "code\game\jobs\job\command\auxiliary\cas_pilot.dm"
 #include "code\game\jobs\job\command\auxiliary\crew_chief.dm"
-#include "code\game\jobs\job\command\auxiliary\dropship_pilot.dm"
 #include "code\game\jobs\job\command\auxiliary\intel.dm"
+#include "code\game\jobs\job\command\auxiliary\pilot.dm"
 #include "code\game\jobs\job\command\auxiliary\senior.dm"
 #include "code\game\jobs\job\command\cic\captain.dm"
 #include "code\game\jobs\job\command\cic\executive.dm"
@@ -827,7 +816,6 @@
 #include "code\game\jobs\job\special\provost.dm"
 #include "code\game\jobs\job\special\uaac.dm"
 #include "code\game\jobs\job\special\uscm.dm"
-#include "code\game\machinery\aicore_lockdown.dm"
 #include "code\game\machinery\air_alarm.dm"
 #include "code\game\machinery\air_sensor.dm"
 #include "code\game\machinery\autolathe.dm"
@@ -883,7 +871,6 @@
 #include "code\game\machinery\ARES\apollo_pda.dm"
 #include "code\game\machinery\ARES\ARES.dm"
 #include "code\game\machinery\ARES\ARES_interface.dm"
-#include "code\game\machinery\ARES\ARES_interface_admin.dm"
 #include "code\game\machinery\ARES\ARES_interface_apollo.dm"
 #include "code\game\machinery\ARES\ARES_procs.dm"
 #include "code\game\machinery\ARES\ARES_records.dm"
@@ -939,14 +926,12 @@
 #include "code\game\machinery\doors\door.dm"
 #include "code\game\machinery\doors\firedoor.dm"
 #include "code\game\machinery\doors\multi_tile.dm"
+#include "code\game\machinery\doors\poddoor.dm"
 #include "code\game\machinery\doors\railing.dm"
 #include "code\game\machinery\doors\runed_sandstone.dm"
+#include "code\game\machinery\doors\shutters.dm"
 #include "code\game\machinery\doors\unpowered.dm"
 #include "code\game\machinery\doors\windowdoor.dm"
-#include "code\game\machinery\doors\poddoor\almayer.dm"
-#include "code\game\machinery\doors\poddoor\poddoor.dm"
-#include "code\game\machinery\doors\poddoor\two_tile.dm"
-#include "code\game\machinery\doors\poddoor\shutters\shutters.dm"
 #include "code\game\machinery\embedded_controller\docking_program.dm"
 #include "code\game\machinery\embedded_controller\embedded_controller_base.dm"
 #include "code\game\machinery\embedded_controller\embedded_program_base.dm"
@@ -1695,7 +1680,6 @@
 #include "code\modules\cm_tech\resources\resource.dm"
 #include "code\modules\cm_tech\techs\abstract\repeatable.dm"
 #include "code\modules\cm_tech\techs\abstract\transitory.dm"
-#include "code\modules\cm_tech\techs\marine\tier1\arc.dm"
 #include "code\modules\cm_tech\techs\marine\tier1\points.dm"
 #include "code\modules\cm_tech\techs\marine\tier2\orbital_ammo.dm"
 #include "code\modules\cm_tech\techs\marine\tier3\cryo_spec.dm"
@@ -1790,7 +1774,6 @@
 #include "code\modules\gear_presets\survivors\survivors.dm"
 #include "code\modules\gear_presets\survivors\corsat\preset_corsat.dm"
 #include "code\modules\gear_presets\survivors\fiorina_sciannex\preset_fiorina_sciannex.dm"
-#include "code\modules\gear_presets\survivors\fiorina_sciannex\riot_in_progress_insert_fiorina_nightmare.dm"
 #include "code\modules\gear_presets\survivors\kutjevo\preset_kutjevo.dm"
 #include "code\modules\gear_presets\survivors\lv_522\forcon_survivors.dm"
 #include "code\modules\gear_presets\survivors\lv_624\clfship_insert_lv624.dm"
@@ -1929,7 +1912,6 @@
 #include "code\modules\mob\living\carbon\human\human_dummy.dm"
 #include "code\modules\mob\living\carbon\human\human_helpers.dm"
 #include "code\modules\mob\living\carbon\human\human_movement.dm"
-#include "code\modules\mob\living\carbon\human\human_stripping.dm"
 #include "code\modules\mob\living\carbon\human\inventory.dm"
 #include "code\modules\mob\living\carbon\human\life.dm"
 #include "code\modules\mob\living\carbon\human\login.dm"
@@ -2182,7 +2164,6 @@
 #include "code\modules\organs\wound.dm"
 #include "code\modules\paperwork\carbonpaper.dm"
 #include "code\modules\paperwork\clipboard.dm"
-#include "code\modules\paperwork\desk_bell.dm"
 #include "code\modules\paperwork\filingcabinet.dm"
 #include "code\modules\paperwork\folders.dm"
 #include "code\modules\paperwork\notepad.dm"
@@ -2374,7 +2355,6 @@
 #include "code\modules\tgui\states\default.dm"
 #include "code\modules\tgui\states\hands.dm"
 #include "code\modules\tgui\states\human_adjacent.dm"
-#include "code\modules\tgui\states\in_view.dm"
 #include "code\modules\tgui\states\inventory.dm"
 #include "code\modules\tgui\states\never.dm"
 #include "code\modules\tgui\states\new_player.dm"
@@ -2392,7 +2372,6 @@
 #include "code\modules\tgui\tgui-say\modal.dm"
 #include "code\modules\tgui\tgui-say\speech.dm"
 #include "code\modules\tgui\tgui-say\typing.dm"
-#include "code\modules\tgui_input\checkboxes.dm"
 #include "code\modules\tgui_input\text.dm"
 #include "code\modules\tgui_panel\audio.dm"
 #include "code\modules\tgui_panel\external.dm"
@@ -2411,16 +2390,13 @@
 #include "code\modules\vehicles\apc\apc_command.dm"
 #include "code\modules\vehicles\apc\apc_medical.dm"
 #include "code\modules\vehicles\apc\interior.dm"
-#include "code\modules\vehicles\arc\arc.dm"
-#include "code\modules\vehicles\arc\verbs.dm"
 #include "code\modules\vehicles\hardpoints\hardpoint.dm"
 #include "code\modules\vehicles\hardpoints\armor\armor.dm"
 #include "code\modules\vehicles\hardpoints\armor\ballistic.dm"
 #include "code\modules\vehicles\hardpoints\armor\caustic.dm"
 #include "code\modules\vehicles\hardpoints\armor\concussive.dm"
 #include "code\modules\vehicles\hardpoints\armor\paladin.dm"
 #include "code\modules\vehicles\hardpoints\armor\snowplow.dm"
-#include "code\modules\vehicles\hardpoints\hardpoint_ammo\arc_sentry_ammo.dm"
 #include "code\modules\vehicles\hardpoints\hardpoint_ammo\autocannon_ammo.dm"
 #include "code\modules\vehicles\hardpoints\hardpoint_ammo\cupola_ammo.dm"
 #include "code\modules\vehicles\hardpoints\hardpoint_ammo\dualcannon_ammo.dm"
@@ -2436,7 +2412,6 @@
 #include "code\modules\vehicles\hardpoints\hardpoint_ammo\tow_ammo.dm"
 #include "code\modules\vehicles\hardpoints\holder\holder.dm"
 #include "code\modules\vehicles\hardpoints\holder\tank_turret.dm"
-#include "code\modules\vehicles\hardpoints\primary\arc_sentry.dm"
 #include "code\modules\vehicles\hardpoints\primary\autocannon.dm"
 #include "code\modules\vehicles\hardpoints\primary\dual_cannon.dm"
 #include "code\modules\vehicles\hardpoints\primary\flamer.dm"
@@ -2451,14 +2426,12 @@
 #include "code\modules\vehicles\hardpoints\secondary\tow.dm"
 #include "code\modules\vehicles\hardpoints\special\firing_port_weapon.dm"
 #include "code\modules\vehicles\hardpoints\special\special.dm"
-#include "code\modules\vehicles\hardpoints\support\antenna.dm"
 #include "code\modules\vehicles\hardpoints\support\artillery.dm"
 #include "code\modules\vehicles\hardpoints\support\flare.dm"
 #include "code\modules\vehicles\hardpoints\support\iwsa.dm"
 #include "code\modules\vehicles\hardpoints\support\overdrive.dm"
 #include "code\modules\vehicles\hardpoints\support\support.dm"
 #include "code\modules\vehicles\hardpoints\wheels\apc_wheels.dm"
-#include "code\modules\vehicles\hardpoints\wheels\arc_wheels.dm"
 #include "code\modules\vehicles\hardpoints\wheels\locomotion.dm"
 #include "code\modules\vehicles\hardpoints\wheels\treads.dm"
 #include "code\modules\vehicles\hardpoints\wheels\van_wheels.dm"