cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tyr/Eclipse Fixes (#11035)

Browse Source
This commit is contained in:
FluffMedic
2025-06-07 23:58:39 -04:00
committed by GitHub
parent b775de40ea
commit b0b453e8ff
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/mechas.dm
View File

@@ -829,7 +829,7 @@
name = "Eclipse Expirmental Janus"
armor = list(melee = 60, bullet = 60, laser = 60, energy = 60, bomb = 80, bio = 100, rad = 100)
specialattackprojectile = /obj/item/projectile/energy/eclipse/janusjavelin
pilot_type = /mob/living/simple_mob/humanoid/eclipse/head/tyrlead
pilot_type = /mob/living/simple_mob/mechanical/mecha/eclipse/sniper
icon_state = "eclipse_janus"
attackcycle = 1
@@ -840,10 +840,12 @@
armor = list(melee = 80, bullet = 80, laser = 40, energy = 40, bomb = 80, bio = 100, rad = 100)
armor_soak = list(melee = 10, bullet = 10, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
icon_state = "eclipse_janus_red"
visible_message(span_cult("[P] has been adapted too!."))
else
armor = list(melee = 40, bullet = 40, laser = 80, energy = 80, bomb = 80, bio = 100, rad = 100)
armor_soak = list(melee = 0, bullet = 0, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
icon_state = "eclipse_janus_orange"
visible_message(span_cult("[P] has been adapted too!."))
/mob/living/simple_mob/mechanical/mecha/eclipse/darkmatter_assualt/do_special_attack(atom/A)
. = TRUE // So we don't fire a bolt as well.
@@ -888,7 +890,7 @@
attackcycle = 0
else if(attackcycle == 2)
say("Activating laser surge")
specialattackprojectile = /obj/item/projectile/energy/burninglaser/boss
specialattackprojectile = /obj/item/projectile/energy/eclipse/janusjavelin
addtimer(CALLBACK(src, PROC_REF(miniburst_a), A, 2), 3 SECONDS, TIMER_DELETE_ME)
else if(attackcycle == 3)
specialattackprojectile = /obj/item/projectile/energy/eclipse/janusjavelin

8
modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/orginalAlts.dm
View File

@@ -17,8 +17,8 @@
/mob/living/simple_mob/mechanical/hivebot/tyr
name = "terraforming hivebot"
maxHealth = 1.5 LASERS_TO_KILL // 60 hp
health = 1.5 LASERS_TO_KILL
maxHealth = 0.5 LASERS_TO_KILL // 20 hp
health = 0.5 LASERS_TO_KILL
icon = 'modular_chomp/icons/mob/hivebot.dmi'
desc = "A robot with strange gardening looking gear."
loot_list = list(/obj/structure/foamedmetal = 100
@@ -72,10 +72,10 @@
/mob/living/simple_mob/mechanical/mecha/eclipse/hivebot/tyr/proc/summon_janitor(atom/target, var/amount, var/next_cycle)
if(!target)
return
new /mob/living/simple_mob/mechanical/combat_drone/artillery
new /mob/living/simple_mob/mechanical/hivebot/tyr
amount--
if(amount > 0)
addtimer(CALLBACK(src, PROC_REF(summon_drones), target, amount, next_cycle), 0.5 SECONDS, TIMER_DELETE_ME)
addtimer(CALLBACK(src, PROC_REF(summon_janitor), target, amount, next_cycle), 0.5 SECONDS, TIMER_DELETE_ME)
else
attackcycle = next_cycle