Tyr Alterations (#11702)

This commit is contained in:
FluffMedic
2025-09-19 18:23:39 -04:00
committed by GitHub
parent 9e91e9017e
commit 54aa0db1d1
6 changed files with 582 additions and 394 deletions

View File

@@ -161,13 +161,21 @@
SSradiation.radiate(src, 15) SSradiation.radiate(src, 15)
/mob/living/simple_mob/animal/tyr/mineral_ants/tritium /mob/living/simple_mob/animal/tyr/mineral_ants/tritium
name = "ritium ant" name = "tritium ant"
icon_state = "tritium_ant" icon_state = "tritium_ant"
icon_living = "tritium_ant" icon_living = "tritium_ant"
butchery_loot = list(\ butchery_loot = list(\
/obj/item/stack/material/tritium = 18\ /obj/item/stack/material/tritium = 18\
) )
/mob/living/simple_mob/animal/tyr/mineral_ants/mhydro
name = "mhydro ant"
icon_state = "mhydro_ant"
icon_living = "mhydro_ant"
butchery_loot = list(\
/obj/item/stack/material/mhydrogen = 6\
)
/mob/living/simple_mob/animal/tyr/mineral_ants/builder /mob/living/simple_mob/animal/tyr/mineral_ants/builder
name = "concrete ant" name = "concrete ant"
icon_state = "builder_ant" icon_state = "builder_ant"
@@ -405,7 +413,8 @@ ANT STRUCTURES
/mob/living/simple_mob/animal/tyr/mineral_ants/diamond, /mob/living/simple_mob/animal/tyr/mineral_ants/diamond,
/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,
/mob/living/simple_mob/animal/tyr/mineral_ants/mhydro)
faction = FACTION_TYR_ANT faction = FACTION_TYR_ANT
/obj/effect/ant_structure/webbarrier /obj/effect/ant_structure/webbarrier

View File

@@ -611,14 +611,22 @@
/mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chambera //poison boss /mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chambera //poison boss
name = "experiment 20" name = "experiment 20"
specialattackprojectile = /obj/item/projectile/energy/eclipse/poisonwind
icon_state = "poison_boss" icon_state = "poison_boss"
icon_living = "poison_boss" icon_living = "poison_boss"
/mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chambera/apply_melee_effects(var/atom/A) /mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chamberc/bullet_act(obj/item/projectile/P)
if(isliving(A)) if(istype(P,/obj/item/projectile/beam) || istype(P, /obj/item/projectile/energy))
var/mob/living/L = A nutrition += 5
L.add_modifier(/datum/modifier/poisoned, 120 SECONDS) if(size_multiplier > 1.95)
visible_message(span_boldwarning(span_orange("[P] heals the beast!.")))
adjustBruteLoss(-nutrition)
adjustFireLoss(-nutrition)
nutrition -= 5
else
size_multiplier += 0.05
..()
else
..()
/mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chambera/do_special_attack(atom/A) /mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chambera/do_special_attack(atom/A)
var/rng_cycle = rand(1,6) var/rng_cycle = rand(1,6)

View File

@@ -51,9 +51,7 @@
/mob/living/simple_mob/mechanical/mecha/eclipse/hivebot/tyr/do_special_attack(atom/A) /mob/living/simple_mob/mechanical/mecha/eclipse/hivebot/tyr/do_special_attack(atom/A)
. = TRUE // So we don't fire a bolt as well. . = TRUE // So we don't fire a bolt as well.
if(attackcycle == 1) if(attackcycle == 1)
say("Prepare. Area. Cleanse. Radiation.") addtimer(CALLBACK(src, PROC_REF(bomb_lines), A, 2), 2 SECONDS, TIMER_DELETE_ME)
specialattackprojectile = /obj/item/projectile/beam/gamma
addtimer(CALLBACK(src, PROC_REF(giant_burst), A, 2), 6 SECONDS, TIMER_DELETE_ME)
attackcycle = 0 attackcycle = 0
else if(attackcycle == 2) else if(attackcycle == 2)
specialattackprojectile = /obj/item/projectile/energy/spikeenergy_ball/boss specialattackprojectile = /obj/item/projectile/energy/spikeenergy_ball/boss

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

File diff suppressed because it is too large Load Diff

View File

@@ -19,6 +19,96 @@
}, },
/turf/simulated/shuttle/floor/alien/blue, /turf/simulated/shuttle/floor/alien/blue,
/area/submap/XenoWeaveMajor) /area/submap/XenoWeaveMajor)
"ae" = (
/obj/effect/floor_decal/techfloor{
dir = 9
},
/obj/effect/floor_decal/techfloor/orange/corner{
dir = 1
},
/obj/effect/floor_decal/techfloor/orange{
dir = 6
},
/obj/structure/foamedmetal,
/turf/simulated/shuttle/floor/alienplating/blue,
/area/submap/XenoWeaveMajor)
"af" = (
/obj/effect/floor_decal/techfloor{
dir = 5
},
/obj/effect/floor_decal/techfloor/orange/corner{
dir = 4
},
/obj/effect/floor_decal/techfloor/orange{
dir = 10
},
/obj/structure/foamedmetal,
/turf/simulated/shuttle/floor/alienplating/blue,
/area/submap/XenoWeaveMajor)
"ag" = (
/obj/effect/floor_decal/techfloor{
dir = 9
},
/obj/effect/floor_decal/techfloor/orange/corner{
dir = 1
},
/obj/effect/floor_decal/techfloor/orange{
dir = 6
},
/mob/living/simple_mob/mechanical/hivebot/nanoevent/pink,
/turf/simulated/shuttle/floor/alienplating/blue,
/area/submap/XenoWeaveMajor)
"ah" = (
/obj/effect/floor_decal/techfloor/orange{
dir = 4
},
/obj/effect/floor_decal/techfloor/orange{
dir = 8
},
/obj/structure/foamedmetal,
/turf/simulated/shuttle/floor/alienplating/blue,
/area/submap/XenoWeaveMajor)
"ai" = (
/obj/structure/foamedmetal,
/turf/simulated/shuttle/floor/alien/blue,
/area/submap/XenoWeaveMajor)
"aj" = (
/obj/effect/floor_decal/techfloor{
dir = 5
},
/obj/effect/floor_decal/techfloor/orange{
dir = 10
},
/obj/effect/floor_decal/techfloor/orange/corner{
dir = 4
},
/obj/structure/foamedmetal,
/turf/simulated/shuttle/floor/alienplating/blue,
/area/submap/XenoWeaveMajor)
"ak" = (
/obj/effect/floor_decal/techfloor{
dir = 6
},
/obj/effect/floor_decal/techfloor/orange/corner,
/obj/effect/floor_decal/techfloor/orange{
dir = 9
},
/obj/structure/foamedmetal,
/turf/simulated/shuttle/floor/alienplating/blue,
/area/submap/XenoWeaveMajor)
"al" = (
/obj/effect/floor_decal/techfloor{
dir = 10
},
/obj/effect/floor_decal/techfloor/orange/corner{
dir = 8
},
/obj/effect/floor_decal/techfloor/orange{
dir = 5
},
/obj/structure/foamedmetal,
/turf/simulated/shuttle/floor/alienplating/blue,
/area/submap/XenoWeaveMajor)
"an" = ( "an" = (
/mob/living/simple_mob/mechanical/mecha/eclipse/hivebot/nanoweavetower, /mob/living/simple_mob/mechanical/mecha/eclipse/hivebot/nanoweavetower,
/turf/simulated/shuttle/floor/alien/blue, /turf/simulated/shuttle/floor/alien/blue,
@@ -741,7 +831,7 @@ TP
wC wC
wC wC
hg hg
mJ ag
Wj Wj
Wj Wj
Wj Wj
@@ -885,9 +975,9 @@ wC
wC wC
wC wC
wC wC
XE ak
mJ ae
ed ai
KM KM
jV jV
wC wC
@@ -937,8 +1027,8 @@ wC
TR TR
jb jb
jb jb
jb ah
mJ ae
wC wC
wC wC
dE dE
@@ -1917,8 +2007,8 @@ wC
XE XE
jb jb
jb jb
jb ah
UV af
wC wC
wC wC
dE dE
@@ -1963,9 +2053,9 @@ wC
wC wC
wC wC
wC wC
TR al
cB aj
Wj ai
Wj Wj
dE dE
wC wC