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 Fixes (#11797)

Browse Source
This commit is contained in:
FluffMedic
2025-10-09 09:20:57 -04:00
committed by GitHub
parent 2ce83fadcc
commit 32cf8b0a70
3 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modular_chomp/code/modules/exploration/bossloots.dm
View File

@@ -48,8 +48,8 @@
defend_chance = 20 defend_chance = 20
icon = 'modular_chomp/icons/mob/tribal_gear.dmi' icon = 'modular_chomp/icons/mob/tribal_gear.dmi'
icon_state = "topshield" icon_state = "sabre"
item_state = "topshield" item_state = "sabre"
item_icons = list( item_icons = list(
slot_l_hand_str = 'modular_chomp/icons/obj/guns/precursor/lefthand.dmi', slot_l_hand_str = 'modular_chomp/icons/obj/guns/precursor/lefthand.dmi',

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

@@ -23,6 +23,12 @@
/mob/living/simple_mob/mechanical/mecha/eclipse/do_special_attack(atom/A) /mob/living/simple_mob/mechanical/mecha/eclipse/do_special_attack(atom/A)
bullet_heck(A, 3, 3) bullet_heck(A, 3, 3)
/mob/living/simple_mob/mechanical/mecha/eclipse/bullet_act(obj/item/projectile/P) //removal of E net cheese
if(P == /obj/item/projectile/beam/energy_net)
return
else
..()
/datum/ai_holder/simple_mob/intentional/three_phases /datum/ai_holder/simple_mob/intentional/three_phases
use_astar = TRUE use_astar = TRUE
wander = FALSE wander = FALSE
@@ -705,14 +711,14 @@
name = "experiment 7" name = "experiment 7"
desc = "A strange furball gaurded by a transparent barrier." desc = "A strange furball gaurded by a transparent barrier."
specialattackprojectile = /obj/item/projectile/energy/eclipse/tyrjavelin specialattackprojectile = /obj/item/projectile/energy/eclipse/tyrjavelin
health = 400 health = 450
maxHealth = 400 //shield mechanic maxHealth = 450 //shield mechanic
icon_state = "UPshield_boss" icon_state = "UPshield_boss"
icon_living = "UPshield_boss" icon_living = "UPshield_boss"
projectiletype = /obj/item/projectile/energy/eclipse/tyrjavelin projectiletype = /obj/item/projectile/energy/eclipse/tyrjavelin
wreckage = /obj/item/prop/tyrlore/basicshield wreckage = /obj/item/prop/tyrlore/basicshield
var/fullshield = 300 var/fullshield = 200
var/shieldrage = 3 var/shieldrage = 200
/mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chamberc/load_default_bellies() /mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chamberc/load_default_bellies()
. = ..() . = ..()
@@ -729,7 +735,7 @@
if(fullshield > 0) if(fullshield > 0)
fullshield -= P.damage fullshield -= P.damage
if(P == /obj/item/projectile/ion) if(P == /obj/item/projectile/ion)
fullshield = 0 fullshield -= 300
visible_message(span_boldwarning(span_orange("[P] breaks the shield!!."))) visible_message(span_boldwarning(span_orange("[P] breaks the shield!!.")))
icon_state = "shield_boss" icon_state = "shield_boss"
if(fullshield > 0) if(fullshield > 0)
@@ -739,10 +745,10 @@
icon_state = "shield_boss" icon_state = "shield_boss"
else else
..() ..()
shieldrage-- shieldrage -= P.damage
if(shieldrage == 0) if(shieldrage > 0)
shieldrage = 3 shieldrage = 200
fullshield = 300 fullshield = 200
visible_message(span_boldwarning(span_orange("The shield reactivates!!."))) visible_message(span_boldwarning(span_orange("The shield reactivates!!.")))
icon_state = "UPshield_boss" icon_state = "UPshield_boss"

6
modular_chomp/code/modules/research/tg/designs/tyrstuff.dm
View File

@@ -36,7 +36,7 @@
name = "Magnet Belt" name = "Magnet Belt"
id = "magnet_belt" id = "magnet_belt"
build_type = PROTOLATHE build_type = PROTOLATHE
materials = list(MAT_BRONZE = 12000,MAT_DIAMOND = 700,MAT_COPPER = 3000,MAT_METALHYDROGEN = 1000,MAT_QUARTZ = 5000,MAT_WEATHERED_AGATE = 8000) materials = list(MAT_BRONZE = 12000,MAT_DIAMOND = 700,MAT_COPPER = 3000,MAT_METALHYDROGEN = 1000,MAT_QUARTZ = 5000,MAT_EAGATE = 8000)
build_path = /obj/item/personal_shield_generator/belt/magnetbelt build_path = /obj/item/personal_shield_generator/belt/magnetbelt
category = list( category = list(
RND_CATEGORY_EQUIPMENT RND_CATEGORY_EQUIPMENT
@@ -47,7 +47,7 @@
name = "Tyrian Energy Blade" name = "Tyrian Energy Blade"
id = "tyr_sabre" id = "tyr_sabre"
build_type = PROTOLATHE build_type = PROTOLATHE
materials = list(MAT_BRONZE = 10000,MAT_DIAMOND = 6000,MAT_COPPER = 8000,MAT_METALHYDROGEN = 2000,MAT_QUARTZ = 2000,MAT_WEATHERED_AGATE = 6000) materials = list(MAT_BRONZE = 10000,MAT_DIAMOND = 6000,MAT_COPPER = 8000,MAT_METALHYDROGEN = 2000,MAT_QUARTZ = 2000,MAT_EAGATE = 6000)
build_path = /obj/item/melee/energy/tyr_sabre build_path = /obj/item/melee/energy/tyr_sabre
category = list( category = list(
RND_CATEGORY_EQUIPMENT RND_CATEGORY_EQUIPMENT
@@ -58,7 +58,7 @@
name = "Tyrian Barrier Bubble" name = "Tyrian Barrier Bubble"
id = "tyr_barrier" id = "tyr_barrier"
build_type = PROTOLATHE build_type = PROTOLATHE
materials = list(MAT_BRONZE = 20000,MAT_DIAMOND = 15000,MAT_COPPER = 15000,MAT_METALHYDROGEN = 20000,MAT_QUARTZ = 50000,MAT_WEATHERED_AGATE = 60000) materials = list(MAT_BRONZE = 20000,MAT_DIAMOND = 15000,MAT_COPPER = 15000,MAT_METALHYDROGEN = 20000,MAT_QUARTZ = 50000,MAT_EAGATE = 60000)
build_path = /obj/item/shield_projector/rectangle/automatic/tyrbarrier build_path = /obj/item/shield_projector/rectangle/automatic/tyrbarrier
category = list( category = list(
RND_CATEGORY_EQUIPMENT RND_CATEGORY_EQUIPMENT