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

Tyr Fixes (#11277)

Browse Source
This commit is contained in:
FluffMedic
2025-08-01 06:39:15 -04:00
committed by GitHub
parent c37a0b46bc
commit 5e764c5c63
5 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/ants.dm
View File

@@ -402,14 +402,14 @@ ANT STRUCTURES
/mob/living/simple_mob/animal/tyr/mineral_ants/verdantium, /mob/living/simple_mob/animal/tyr/mineral_ants/verdantium,
/mob/living/simple_mob/animal/tyr/mineral_ants/tritium, /mob/living/simple_mob/animal/tyr/mineral_ants/tritium,
/mob/living/simple_mob/animal/tyr/mineral_ants/uranium) /mob/living/simple_mob/animal/tyr/mineral_ants/uranium)
faction = FACTION_TYR faction = FACTION_TYR_ANT
/obj/effect/ant_structure/webbarrier /obj/effect/ant_structure/webbarrier
name = "weblike barrier" name = "weblike barrier"
icon_state = "web" icon_state = "web"
/obj/effect/ant_structure/webbarrier/CanPass(atom/movable/mover, turf/target) /obj/effect/ant_structure/webbarrier/CanPass(atom/movable/mover, turf/target)
if(istype(mover, /mob/living/simple_mob/animal/giant_spider)) if(istype(mover, /mob/living/simple_mob/animal/tyr/mineral_ants))
return TRUE return TRUE
else if(istype(mover, /mob/living)) else if(istype(mover, /mob/living))
if(prob(80)) if(prob(80))

8
modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/bhattacks.dm
View File

@@ -645,6 +645,14 @@
bullet_heck(target, -2, 4) bullet_heck(target, -2, 4)
bullet_heck(target, -3, 4) bullet_heck(target, -3, 4)
bullet_heck(target, -4, 4) bullet_heck(target, -4, 4)
bullet_heck(target, -4, 3)
bullet_heck(target, -4, 2)
bullet_heck(target, -4, 1)
bullet_heck(target, -4, 0)
bullet_heck(target, -4, -1)
bullet_heck(target, -4, -2)
bullet_heck(target, -4, -3)
bullet_heck(target, -4, -4)
/mob/living/simple_mob/mechanical/mecha/eclipse/proc/checker_board(atom/target, var/next_cycle) /mob/living/simple_mob/mechanical/mecha/eclipse/proc/checker_board(atom/target, var/next_cycle)
bullet_heck(target, -1, 1) bullet_heck(target, -1, 1)

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

@@ -295,11 +295,11 @@
var/deathdir = rand(1,3) var/deathdir = rand(1,3)
switch(deathdir) switch(deathdir)
if(1) if(1)
new /mob/living/simple_mob/mechanical/mining_drone/scavenger/eclipse (src.loc) new /mob/living/simple_mob/mechanical/mining_drone/scavenger/eclipse(src.loc)
if(2) if(2)
new /mob/living/simple_mob/mechanical/hivebot/swarm/eclipse (src.loc) new /mob/living/simple_mob/mechanical/hivebot/swarm/eclipse(src.loc)
if(3) if(3)
new /mob/living/simple_mob/mechanical/combat_drone/artillery new /mob/living/simple_mob/mechanical/combat_drone/artillery(src.loc)
amount-- amount--
if(amount > 0) if(amount > 0)
addtimer(CALLBACK(src, PROC_REF(summon_drones), target, amount, fire_delay), fire_delay, TIMER_DELETE_ME) addtimer(CALLBACK(src, PROC_REF(summon_drones), target, amount, fire_delay), fire_delay, TIMER_DELETE_ME)

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

@@ -53,6 +53,8 @@
//This one however, is the simplest one, more meant as an intro //This one however, is the simplest one, more meant as an intro
/mob/living/simple_mob/mechanical/mecha/eclipse/antipersonal_unit //Melts folks with lasers /mob/living/simple_mob/mechanical/mecha/eclipse/antipersonal_unit //Melts folks with lasers
name = "Eclipse Expirmental Anti-Infantary Unit" name = "Eclipse Expirmental Anti-Infantary Unit"
health = 400
maxHealth = 400
specialattackprojectile = /obj/item/projectile/energy/eclipse/lorge specialattackprojectile = /obj/item/projectile/energy/eclipse/lorge
armor = list(melee = 60, bullet = 60, laser = 60, energy = 60, bomb = 90, bio = 100, rad = 100) armor = list(melee = 60, bullet = 60, laser = 60, energy = 60, bomb = 90, bio = 100, rad = 100)
icon_state = "orb" icon_state = "orb"
@@ -435,7 +437,6 @@
wreckage = /obj/item/melee/energy/sword/top_shield wreckage = /obj/item/melee/energy/sword/top_shield
specialattackprojectile = /obj/item/projectile/energy/eclipse/chillingwind specialattackprojectile = /obj/item/projectile/energy/eclipse/chillingwind
desc = "It appears to be spinning at rapid speeds; enough to deflect projectiles. The air around it feels frigid.." desc = "It appears to be spinning at rapid speeds; enough to deflect projectiles. The air around it feels frigid.."
artidrop = /obj/item/material/barbedwire/vopal/active
/mob/living/simple_mob/mechanical/mecha/eclipse/battle_top/do_special_attack(atom/A) /mob/living/simple_mob/mechanical/mecha/eclipse/battle_top/do_special_attack(atom/A)
var/rng_cycle var/rng_cycle

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

@@ -70,7 +70,7 @@
/mob/living/simple_mob/mechanical/mecha/eclipse/hivebot/tyr/proc/summon_janitor(atom/target, var/amount, var/next_cycle) /mob/living/simple_mob/mechanical/mecha/eclipse/hivebot/tyr/proc/summon_janitor(atom/target, var/amount, var/next_cycle)
if(!target) if(!target)
return return
new /mob/living/simple_mob/mechanical/hivebot/tyr new /mob/living/simple_mob/mechanical/hivebot/tyr(src.loc)
amount-- amount--
if(amount > 0) if(amount > 0)
addtimer(CALLBACK(src, PROC_REF(summon_janitor), 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)