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

Update For Tyr (#11770)

Browse Source
This commit is contained in:
FluffMedic
2025-10-03 18:33:50 -04:00
committed by GitHub
parent d22d944b08
commit 6770c5ec4f
8 changed files with 29948 additions and 29963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
modular_chomp/code/game/objects/structures/tyr_project_props.dm
View File

@@ -1,7 +1,7 @@
//oooh, shiny
/obj/structure/prop/tyr_elevator //This won't function for a while, if ever
name = "odd elevator"
desc = "A strange metal cylandir. Seems sealed shut."
desc = "A strange metal cylandir, a partially functioning elevator it seems."
icon = 'modular_chomp/icons/obj/tribal_gear.dmi'
icon_state = "elevator"
anchored = TRUE
@@ -476,6 +476,7 @@
icon_state = "barbedwire-out"
/obj/item/prop/tyrlore/reddisc
name = "red tyrian data disc"
catalogue_data = list(/datum/category_item/catalogue/anomalous/tyr_red)
color = "#FFFFFF"
@@ -494,6 +495,7 @@
value = CATALOGUER_REWARD_HARD
/obj/item/prop/tyrlore/purpledisc
name = "purple tyrian data disc"
catalogue_data = list(/datum/category_item/catalogue/anomalous/tyr_purple)
color = "#530E31"
@@ -512,6 +514,7 @@
value = CATALOGUER_REWARD_HARD
/obj/item/prop/tyrlore/greendisc
name = "green tyrian data disc"
catalogue_data = list(/datum/category_item/catalogue/anomalous/tyr_green)
color = "#530E31"
@@ -525,6 +528,7 @@
value = CATALOGUER_REWARD_HARD
/obj/item/prop/tyrlore/basicflora
name = "tyrian flora data disc"
color = "#FF66CC"
catalogue_data = list(/datum/category_item/catalogue/anomalous/tyre_basicflora)
@@ -538,6 +542,7 @@
value = CATALOGUER_REWARD_HARD
/obj/item/prop/tyrlore/basicshield
name = "tyrian shield data disc"
color = "#530E31"
catalogue_data = list(/datum/category_item/catalogue/anomalous/tyre_basicshield)
@@ -551,6 +556,7 @@
value = CATALOGUER_REWARD_HARD
/obj/item/prop/tyrlore/advanceshield
name = "tyrian shield 2 data disc"
color = "#FF0000"
catalogue_data = list(/datum/category_item/catalogue/anomalous/tyre_advanceshield)
@@ -565,6 +571,7 @@
value = CATALOGUER_REWARD_HARD
/obj/item/prop/tyrlore/basicsonic
name = "tyrian sonic data disc"
color = "#CCCCFF"
catalogue_data = list(/datum/category_item/catalogue/anomalous/tyre_basicsonic)
@@ -578,6 +585,7 @@
value = CATALOGUER_REWARD_HARD
/obj/item/prop/tyrlore/basicpower
name = "tyrian power data disc"
color = "#530E31"
catalogue_data = list(/datum/category_item/catalogue/anomalous/tyre_basicpower)
@@ -591,6 +599,7 @@
value = CATALOGUER_REWARD_HARD
/obj/item/prop/tyrlore/ants
name = "tyrian ants data disc"
color = "#993300"
catalogue_data = list(/datum/category_item/catalogue/anomalous/tyre_ants)
@@ -604,6 +613,7 @@
value = CATALOGUER_REWARD_HARD
/obj/item/prop/tyrlore/drones
name = "tyrian drone data disc"
catalogue_data = list(/datum/category_item/catalogue/anomalous/tyre_drones)
/datum/category_item/catalogue/anomalous/tyre_drones
@@ -614,3 +624,17 @@
Further data siphoning to contunie\
Remodel based off their blueprints."
value = CATALOGUER_REWARD_HARD
/obj/item/prop/tyrlore/fossiltank
name = "final desgination"
icon_state = "old_disc_eclipse"
catalogue_data = list(/datum/category_item/catalogue/anomalous/fossil_tank)
/datum/category_item/catalogue/anomalous/fossil_tank
name = "Rolling Crematorium"
desc = "Station Point - Lost\
Attackers - The Terrain\
Leader - Nonfunctional\
Objective - Eliminate all hostiles\
Awaiting further instruction."
value = CATALOGUER_REWARD_HARD

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

@@ -1,10 +1,10 @@
/mob/living/simple_mob/animal/tyr/mineral_ants
name = "metal ant"
desc = "A large ant."
icon_state = "ne_ant"
icon_state = "new_ant"
icon_dead = "dead_new"
maxHealth = 25 //two hits with agate sword, three with spear, one with hammer, four with bow
health = 25
maxHealth = 15
health = 15
pass_flags = PASSTABLE
movement_cooldown = 1
@@ -83,7 +83,7 @@
visible_message(span_danger("\The [src] hits \the [L] with incredible force, to no visible effect!")) // CHOMPEdit: Visible/audible feedback for *resisting* the slam.
playsound(src, "punch", 50, 1) // CHOMPEdit: Visible/audible feedback for *resisting* the slam.
/mob/living/simple_mob/animal/tyr/mineral_ants/copper //emp ants
/mob/living/simple_mob/animal/tyr/mineral_ants/copper //lighting ants
name = "copper metal ant"
icon_state = "copper_ant"
icon_living = "copper_ant"
@@ -138,10 +138,15 @@
meat_amount = 3
meat_type = /obj/item/reagent_containers/food/snacks/painiteant
/mob/living/simple_mob/animal/tyr/mineral_ants/diamond
/mob/living/simple_mob/animal/tyr/mineral_ants/diamond //slower, tankier, more damage
name = "diamond metal ant"
icon_state = "diamond_ant"
icon_living = "diamond_ant"
maxHealth = 50
health = 50
melee_damage_lower = 24
melee_damage_upper = 24
movement_cooldown = 3
butchery_loot = list(\
/obj/item/stack/material/diamond = 18\
)
@@ -154,7 +159,7 @@
/obj/item/stack/material/verdantium = 18\
)
/mob/living/simple_mob/animal/tyr/mineral_ants/uranium
/mob/living/simple_mob/animal/tyr/mineral_ants/uranium //if it melees, it unleashes rads
name = "glowing metal ant"
icon_state = "rad_ant"
icon_living = "rad_ant"
@@ -172,7 +177,7 @@
/obj/item/stack/material/tritium = 18\
)
/mob/living/simple_mob/animal/tyr/mineral_ants/mhydro
/mob/living/simple_mob/animal/tyr/mineral_ants/mhydro //secondary spawner
name = "mhydro ant"
icon_state = "mhydro_ant"
icon_living = "mhydro_ant"
@@ -180,6 +185,15 @@
/obj/item/stack/material/mhydrogen = 6\
)
special_attack_min_range = 4
special_attack_max_range = 7
special_attack_cooldown = 15 SECONDS
/mob/living/simple_mob/animal/tyr/mineral_ants/mydro/do_special_attack(atom/A)
for(var/i =1 to 3)
new /obj/effect/spider/spiderling/antling(src.loc)
new /obj/effect/spider/spiderling/antling(src.loc)
/mob/living/simple_mob/animal/tyr/mineral_ants/builder
name = "concrete ant"
icon_state = "builder_ant"
@@ -224,7 +238,7 @@
return TRUE
/mob/living/simple_mob/animal/tyr/mineral_ants/queen //There will only be two queens on the map, and the source of further ants. Farming dies if they die.
/mob/living/simple_mob/animal/tyr/mineral_ants/queen //the nurses of the ants
name = "queen ant"
icon_state = "queen_ant"
maxHealth = 60 //four hits with agate sword, five with spear, two with hammer, eight with bow
@@ -232,7 +246,7 @@
butchery_loot = list(\
/obj/item/stack/material/valhollide = 4\
)
nutrition = 480
nutrition = 630
var/build_type = /obj/effect/spider/spiderling/antling
@@ -284,7 +298,7 @@ ANT STRUCTURES
spawn_types = list(
/mob/living/simple_mob/animal/tyr/mineral_ants/bronze = 1,
/mob/living/simple_mob/animal/tyr/mineral_ants/builder = 2,
/mob/living/simple_mob/animal/tyr/mineral_ants/builder = 1,
/mob/living/simple_mob/animal/tyr/mineral_ants/copper = 1,
/mob/living/simple_mob/animal/tyr/mineral_ants/quartz = 1,
/mob/living/simple_mob/animal/tyr/mineral_ants/agate = 1,
@@ -292,10 +306,11 @@ ANT STRUCTURES
/mob/living/simple_mob/animal/tyr/mineral_ants/diamond = 1,
/mob/living/simple_mob/animal/tyr/mineral_ants/verdantium = 1,
/mob/living/simple_mob/animal/tyr/mineral_ants/tritium = 1,
/mob/living/simple_mob/animal/tyr/mineral_ants/uranium = 1
/mob/living/simple_mob/animal/tyr/mineral_ants/uranium = 1,
/mob/living/simple_mob/animal/tyr/mineral_ants/mhydro = 1
)
simultaneous_spawns = 5
simultaneous_spawns = 3
destructible = 1
health = 50 //Unsure why you would want to break it but you can

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

@@ -599,10 +599,12 @@
/obj/item/stock_parts/capacitor/hyper = 80,
/obj/item/stock_parts/manipulator/hyper = 80,
/obj/item/stock_parts/matter_bin/hyper = 80,
/obj/item/reagent_containers/food/snacks/meat = 100
)
/mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chambera //poison boss
name = "experiment 20"
desc = "A strange furball fused with plant life."
icon_state = "poison_boss"
icon_living = "poison_boss"
wreckage = /obj/item/prop/tyrlore/basicflora
@@ -656,6 +658,7 @@
/mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chamberb //knock back boss
name = "experiment 3"
desc = "A strange furball, the air vibrating around it."
specialattackprojectile = /obj/item/projectile/knockback/slow
icon_state = "sonic_boss"
icon_living = "sonic_boss"
@@ -699,6 +702,7 @@
/mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chamberc //wierd shields
name = "experiment 7"
desc = "A strange furball gaurded by a transparent barrier."
specialattackprojectile = /obj/item/projectile/energy/eclipse/tyrjavelin
health = 400
maxHealth = 400 //shield mechanic
@@ -797,7 +801,7 @@
/mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chamberf
name = "engineering automaton"
desc = "A large, very important looking ai. Plating appears similiar to albative plating."
desc = "A large important looking robot, crackling with lighting."
icon = 'modular_chomp/icons/mob/hivebot.dmi'
icon_state = "yellow"
icon_living = "yellow"
@@ -805,27 +809,6 @@
wreckage = /obj/item/prop/tyrlore/basicpower
specialattackprojectile = /obj/item/projectile/energy/lightingspark/nanoweave
projectiletype = /obj/item/projectile/energy/lightingspark/nanoweave
loot_list = list(/obj/item/projectile/energy/wp_shotgun = 30,
/obj/item/gun/energy/energyballchain = 30,
/obj/item/tool/wirecutters/hybrid/alien = 30,
/obj/item/tool/wrench/hybrid/alien = 30,
/obj/item/tool/crowbar/hybrid/alien = 30,
/obj/item/tool/screwdriver/hybrid/alien = 30,
/obj/item/pickaxe/diamonddrill/alien = 30,
/obj/item/melee/energy/sword/dualsaber = 30,
/obj/item/shield_projector/rectangle/automatic/tyrvault = 0.01,
/obj/item/stock_parts/scanning_module/omni = 80,
/obj/item/stock_parts/micro_laser/omni = 80,
/obj/item/stock_parts/capacitor/omni = 80,
/obj/item/stock_parts/manipulator/omni = 80,
/obj/item/stock_parts/matter_bin/omni = 80,
/obj/item/stock_parts/scanning_module/hyper = 80,
/obj/item/stock_parts/micro_laser/hyper = 80,
/obj/item/stock_parts/capacitor/hyper = 80,
/obj/item/stock_parts/manipulator/hyper = 80,
/obj/item/stock_parts/matter_bin/hyper = 80,
/obj/item/melee/midnightblade = 100
)
/mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chamberf/do_special_attack(atom/A)
rng_cycle = rand(1,6)
@@ -853,6 +836,7 @@
/mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chamberg //wierd shields
name = "expirement 28"
desc = "A strange furball gaurded by a transparent barrier."
specialattackprojectile = /obj/item/projectile/energy/eclipse/tyrjavelin
resistance = 10
icon_state = "UPshield_boss"
@@ -903,6 +887,7 @@
/mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/massswarm
name = "swarm controler"
desc = "A massive hivebot that has shifting bits of metal upon it's body."
health = 600
maxHealth = 600
icon_state = "bright_green"
@@ -929,7 +914,7 @@
new /mob/living/simple_mob/mechanical/hivebot/nanoevent/bright_green/tyr(src.loc)
..()
/mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/finale/do_special_attack(atom/A)
/mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/massswarm/do_special_attack(atom/A)
rng_cycle = rand(1,2)
if(attackcycle == 1)
addtimer(CALLBACK(src, PROC_REF(bomb_chaos), A, rng_cycle), 2.5 SECONDS, TIMER_DELETE_ME)

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

@@ -32,7 +32,7 @@
/mob/living/simple_mob/mechanical/mecha/eclipse/hivebot/tyr
name = "ai control center"
desc = "A large, very important looking ai. Plating appears similiar to albative plating."
desc = "A large, very important looking ai. It sparks as it moves to attacks."
icon_state = "powertower"
icon_living = "powertower"
faction = FACTION_TYR
@@ -43,7 +43,27 @@
wreckage = /obj/item/prop/tyrlore/reddisc
ai_holder_type = /datum/ai_holder/simple_mob/intentional/three_phases
anchored = 1
armor = list(melee = 40, bullet = 40, laser = 80, energy = 80, bomb = 50, bio = 100, rad = 100)
armor = list(melee = 40, bullet = 40, laser = 40, energy = 40, bomb = 50, bio = 100, rad = 100)
loot_list = list(/obj/item/tool/wirecutters/hybrid/alien = 10,
/obj/item/tool/wrench/hybrid/alien = 10,
/obj/item/tool/crowbar/hybrid/alien = 10,
/obj/item/tool/screwdriver/hybrid/alien = 10,
/obj/item/pickaxe/diamonddrill/alien = 10,
/obj/item/melee/energy/sword/dualsaber = 10,
/obj/item/shield_projector/rectangle/automatic/tyrvault = 0.01,
/obj/item/stock_parts/scanning_module/omni = 80,
/obj/item/stock_parts/micro_laser/omni = 80,
/obj/item/stock_parts/capacitor/omni = 80,
/obj/item/stock_parts/manipulator/omni = 80,
/obj/item/stock_parts/matter_bin/omni = 80,
/obj/item/stock_parts/scanning_module/hyper = 80,
/obj/item/stock_parts/micro_laser/hyper = 80,
/obj/item/stock_parts/capacitor/hyper = 80,
/obj/item/stock_parts/manipulator/hyper = 80,
/obj/item/stock_parts/matter_bin/hyper = 80,
)
/datum/ai_holder/simple_mob/intentional/three_phases/nomove/walk_to_destination()
return
@@ -58,7 +78,7 @@
addtimer(CALLBACK(src, PROC_REF(dual_spin), A, 3, 15), 1 SECOND, TIMER_DELETE_ME)
attackcycle = 0
else if(attackcycle == 3)
specialattackprojectile = /obj/item/projectile/energy/spikeenergy_ball/boss
specialattackprojectile = /obj/item/projectile/energy/eclipse/tyrjavelin
addtimer(CALLBACK(src, PROC_REF(quad_random_firing), A, 12, 1, 0.5 SECONDS), 1 SECOND, TIMER_DELETE_ME)
attackcycle = 0

8
modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/weather.dm
View File

@@ -5,8 +5,8 @@
maxHealth = 500
armor = list(melee = 40, bullet = 40, laser = 40, energy = 40, bomb = 50, bio = 100, rad = 100) //No thematics but I like boss critters to take a bit
icon_state = "rex"
melee_attack_delay = 0.5 SECONDS
melee_damage_lower = 40 //Will murder you if you get within melee.
melee_attack_delay = 2 SECONDS
melee_damage_lower = 40
melee_damage_upper = 40
attack_armor_pen = 40
damage_fatigue_mult = 1 //Does slowly pick up speed.
@@ -21,7 +21,7 @@
special_attack_min_range = 1
special_attack_max_range = 14 //The special attacks are more meant to pin you down or provide a healing to this tank.
special_attack_cooldown = 10 SECONDS
swallowTime = 0.5 SECONDS
swallowTime = 1.5 SECONDS
vore_active = 1
vore_capacity = 1
vore_bump_chance = 10
@@ -35,8 +35,10 @@
grab_resist = 100
devourable = FALSE
faction = FACTION_ECLIPSE
size_multiplier = 2
loot_list = list(/obj/item/personal_shield_generator/belt/fossiltank = 100,
/obj/item/prop/tyrlore/fossiltank = 100,
)
/mob/living/simple_mob/vore/fossiltank/load_default_bellies()

4
modular_chomp/code/modules/research/tg/techweb/nodes/exploration.dm
View File

@@ -1,7 +1,7 @@
/datum/techweb_node/tyr_loot
id = TECHWEB_NODE_TYRGOODS
display_name = "Explosives"
description = "For once, intentional explosions."
display_name = "Tyrian Tech"
description = "By utilizing advanced scanning technolgy, reverse enginer tyrian tech.."
prereq_ids = list(TECHWEB_NODE_MOD_ANOMALY_SUIT)
design_ids = list(
"tyr_rifle",