diff --git a/ModularTegustation/tegu_items/limbus_labs/!abno_overwrites.dm b/ModularTegustation/tegu_items/limbus_labs/!abno_overwrites.dm index 5525c8318130..b867c102f962 100644 --- a/ModularTegustation/tegu_items/limbus_labs/!abno_overwrites.dm +++ b/ModularTegustation/tegu_items/limbus_labs/!abno_overwrites.dm @@ -31,3 +31,7 @@ beam_damage = 4 beats_damage = 80 faction = list("neutral") + +/mob/living/simple_animal/hostile/abnormality/steam/Initialize() + if(SSmaptype.maptype == "limbus_labs") + ChangeResistances(1, 1, 2, 1.5) diff --git a/ModularTegustation/tegu_items/limbus_labs/spawners.dm b/ModularTegustation/tegu_items/limbus_labs/spawners.dm index 4c9501aa4ee7..fa094f153f74 100644 --- a/ModularTegustation/tegu_items/limbus_labs/spawners.dm +++ b/ModularTegustation/tegu_items/limbus_labs/spawners.dm @@ -15,14 +15,15 @@ GLOBAL_LIST_INIT(low_security, list( /mob/living/simple_animal/hostile/abnormality/eris, /mob/living/simple_animal/hostile/abnormality/schadenfreude, /mob/living/simple_animal/hostile/abnormality/galaxy_child, - /mob/living/simple_animal/hostile/abnormality/woodsman + /mob/living/simple_animal/hostile/abnormality/woodsman, + /mob/living/simple_animal/hostile/abnormality/steam + )) GLOBAL_LIST_INIT(high_security, list( /mob/living/simple_animal/hostile/abnormality/clouded_monk, /mob/living/simple_animal/hostile/abnormality/clown, /mob/living/simple_animal/hostile/abnormality/nothing_there, - /mob/living/simple_animal/hostile/abnormality/steam, /mob/living/simple_animal/hostile/abnormality/mountain, /mob/living/simple_animal/hostile/abnormality/despair_knight, /mob/living/simple_animal/hostile/abnormality/red_hood, diff --git a/code/modules/mob/living/simple_animal/abnormality/he/steam_transport_machine.dm b/code/modules/mob/living/simple_animal/abnormality/he/steam_transport_machine.dm index 62d7c1e4cc1e..262aebe6df63 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/steam_transport_machine.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/steam_transport_machine.dm @@ -84,18 +84,29 @@ /mob/living/simple_animal/hostile/abnormality/steam/proc/UpdateStats() src.set_light(3, (gear * 2), "D4FAF37") - ChangeResistances(list( - RED_DAMAGE = (0.5 - (gear * 0.1)), - WHITE_DAMAGE = (1 - (gear * 0.1)), - BLACK_DAMAGE = (2 - (gear * 0.1)), - PALE_DAMAGE = (1.5 - (gear * 0.1)), - )) + if(SSmaptype.maptype == "limbus_labs") + ChangeResistances(list( + RED_DAMAGE = (1 - (gear * 0.1)), + WHITE_DAMAGE = (1 - (gear * 0.1)), + BLACK_DAMAGE = (2 - (gear * 0.1)), + PALE_DAMAGE = (1.5 - (gear * 0.1)), + )) + melee_damage_lower = (20 + (4 * gear)) + melee_damage_upper = (35 + (4 * gear)) + steam_damage = (5 + (1.5 * gear)) + else + ChangeResistances(list( + RED_DAMAGE = (0.5 - (gear * 0.1)), + WHITE_DAMAGE = (1 - (gear * 0.1)), + BLACK_DAMAGE = (2 - (gear * 0.1)), + PALE_DAMAGE = (1.5 - (gear * 0.1)), + )) + melee_damage_lower = (20 + (10 * gear)) + melee_damage_upper = (35 + (10 * gear)) + steam_damage = (5 + (3 * gear)) var/oldhealth = maxHealth maxHealth = (1600 + (400 * gear)) adjustBruteLoss(oldhealth - maxHealth) //Heals 400 health in a gear shift if it's already breached - melee_damage_lower = (20 + (10 * gear)) - melee_damage_upper = (35 + (10 * gear)) - steam_damage = (5 + (3 * gear)) work_damage_amount = (9 + (2 * gear)) ranged_cooldown_time = (40 - (5 * gear)) start_qliphoth = (max(1,(4 - gear))) diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/despair_knight.dm b/code/modules/mob/living/simple_animal/abnormality/waw/despair_knight.dm index 56cfebd86a46..4eccf2f2a039 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/despair_knight.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/despair_knight.dm @@ -63,19 +63,17 @@ /datum/action/innate/change_icon_kod name = "Toggle Icon" - desc = "Toggle your icon between breached and contained. (Works only for Limbus Company Labratories)" + desc = "Toggle your icon between breached and friendly. (Works only for Limbus Company Labratories)" /datum/action/innate/change_icon_kod/Activate() . = ..() if(SSmaptype.maptype == "limbus_labs") - owner.icon = 'ModularTegustation/Teguicons/48x48.dmi' - owner.icon_state = "despair" + owner.icon_state = "despair_friendly" active = 1 /datum/action/innate/change_icon_kod/Deactivate() . = ..() if(SSmaptype.maptype == "limbus_labs") - owner.icon = 'ModularTegustation/Teguicons/64x64.dmi' owner.icon_state = "despair_breach" active = 0