From ed5454d1948c86479e36e46adc8b1b839646e84d Mon Sep 17 00:00:00 2001 From: Fluff Date: Tue, 25 Apr 2023 15:49:00 -0400 Subject: [PATCH] Removing Hitscan, and curving some things Will write in proper PR. --- .../simple_mob/subtypes/animal/spider.dm | 44 +++++++++++++++++++ .../simple_mob/subtypes/humanoid/mercenary.dm | 2 + .../simple_mob/subtypes/humanoid/pirate.dm | 5 +++ .../mechanical/drones/combat_drone.dm | 5 ++- .../subtypes/mechanical/hivebot/hivebot.dm | 4 ++ .../subtypes/mechanical/mecha/combat.dm | 5 +++ .../subtypes/mechanical/mecha/gygax.dm | 6 +-- .../living/simple_mob/subtypes/vore/wolf.dm | 6 ++- modular_chomp/code/modules/projectiles/mob.dm | 33 ++++++++++++++ vorestation.dme | 6 +++ 10 files changed, 111 insertions(+), 5 deletions(-) create mode 100644 modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/spider.dm create mode 100644 modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/mercenary.dm create mode 100644 modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/pirate.dm create mode 100644 modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm create mode 100644 modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/combat.dm create mode 100644 modular_chomp/code/modules/projectiles/mob.dm diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/spider.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/spider.dm new file mode 100644 index 0000000000..c203fe8dc4 --- /dev/null +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/spider.dm @@ -0,0 +1,44 @@ +//Unfiying spider health, into two catagories. Disrupters and tanks. +/mob/living/simple_mob/animal/giant_spider/carrier //Disrupter, old 100 + maxHealth = 70 + health = 70 + +/mob/living/simple_mob/animal/giant_spider/electric //disrupter, old 210 + maxHealth = 70 + health = 70 + +/mob/living/simple_mob/animal/giant_spider/frost //tank, old 175 + maxHealth = 130 + health = 130 + +/mob/living/simple_mob/animal/giant_spider/ion //disrupter, old 90 + maxHealth = 70 + health = 70 + +/mob/living/simple_mob/animal/giant_spider/hunter //disrupter, old 120 + maxHealth = 70 + health = 70 + +/mob/living/simple_mob/animal/giant_spider/lurker //disrupter, old 100 + maxHealth = 70 + health = 70 + +/mob/living/simple_mob/animal/giant_spider/pepper //tank, old 210 + maxHealth = 130 + health = 130 + +/mob/living/simple_mob/animal/giant_spider/phorogenic //tank, old 225 + maxHealth = 130 + health = 130 + +/mob/living/simple_mob/animal/giant_spider/thermic //tank, old 175 + maxHealth = 130 + health = 130 + +/mob/living/simple_mob/animal/giant_spider/tunneler_spider //disrupter, old 120 + maxHealth = 70 + health = 70 + +/mob/living/simple_mob/animal/giant_spider/webslinger //disrupter, old 90 + maxHealth = 70 + health = 70 \ No newline at end of file diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/mercenary.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/mercenary.dm new file mode 100644 index 0000000000..09cae4b015 --- /dev/null +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/mercenary.dm @@ -0,0 +1,2 @@ +/mob/living/simple_mob/humanoid/merc/ranged/laser + projectiletype = /obj/item/projectile/energy/mob/midlaser \ No newline at end of file diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/pirate.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/pirate.dm new file mode 100644 index 0000000000..f21d8445ab --- /dev/null +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/pirate.dm @@ -0,0 +1,5 @@ +/mob/living/simple_mob/humanoid/pirate/ranged/handcannon + projectiletype = /obj/item/projectile/energy/mob/heavylaser + +/mob/living/simple_mob/humanoid/pirate/captain + projectiletype = /obj/item/projectile/energy/mob/heavylaser \ No newline at end of file diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm index 8c5d9c40db..4dde3c8b91 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm @@ -1,9 +1,12 @@ +/mob/living/simple_mob/mechanical/combat_drone + projectiletype = /obj/item/projectile/energy/mob/drone + /mob/living/simple_mob/mechanical/combat_drone/lesser/aerostat desc = "A Vir System Authority automated combat drone with an aged apperance." movement_cooldown = 10 say_list_type = /datum/say_list/malf_drone/drone_aerostat ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting/threatening/drone_aerostat - + /datum/say_list/malf_drone/drone_aerostat speak = list("ALERT.","Hostile-ile-ile entities dee-twhoooo-wected.","Threat parameterszzzz- szzet.","Bring sub-sub-sub-systems uuuup to combat alert alpha-a-a.") emote_see = list("beeps menacingly","whirrs threateningly","scans its immediate vicinity") diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm new file mode 100644 index 0000000000..e0615011e9 --- /dev/null +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm @@ -0,0 +1,4 @@ +/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser + name = "laser hivebot" + desc = "A robot with a photonic weapon integrated into itself." + projectiletype = /obj/item/projectile/energy/mob/drone \ No newline at end of file diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/combat.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/combat.dm new file mode 100644 index 0000000000..8b86c59c6c --- /dev/null +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/combat.dm @@ -0,0 +1,5 @@ +/mob/living/simple_mob/mechanical/mecha/combat/durand + projectiletype = /obj/item/projectile/energy/mob/heavylaser + +/mob/living/simple_mob/mechanical/mecha/combat/marauder + projectiletype = /obj/item/projectile/energy/mob/heavylaser \ No newline at end of file diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/gygax.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/gygax.dm index f78374f4f5..b6da1d6024 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/gygax.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/gygax.dm @@ -1,9 +1,9 @@ - /mob/living/simple_mob/mechanical/mecha/combat/gygax - movement_cooldown = 1 //Because normal Gygaxes are tougher then ths boss version with 0 speed + movement_cooldown = 0 //Because normal Gygaxes are tougher then ths boss version with 0 speed + projectiletype = /obj/item/projectile/energy/mob/midlaser /mob/living/simple_mob/mechanical/mecha/combat/gygax/dark/advanced - movement_cooldown = 0 //Because AADG needs all the help it can get. + movement_cooldown = -2 //Because AADG needs all the help it can get. /mob/living/simple_mob/mechanical/mecha/combat/gygax/aerostat desc = "A Vir System Authority automated combat mech with an aged apperance." diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm index 309076d2a5..f5d7f59e09 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm @@ -1,3 +1,7 @@ /mob/living/simple_mob/animal/wolf/direwolf/Initialize() . = ..() - verbs += /mob/living/simple_mob/proc/pick_color \ No newline at end of file + verbs += /mob/living/simple_mob/proc/pick_color + +/mob/living/simple_mob/animal/wolf/direwolf + maxHealth = 100 + health = 100 \ No newline at end of file diff --git a/modular_chomp/code/modules/projectiles/mob.dm b/modular_chomp/code/modules/projectiles/mob.dm new file mode 100644 index 0000000000..90ed7843b6 --- /dev/null +++ b/modular_chomp/code/modules/projectiles/mob.dm @@ -0,0 +1,33 @@ +/obj/item/projectile/energy/mob + icon = 'icons/obj/projectiles_impact.dmi' + +/obj/item/projectile/energy/mob/heavylaser + name = "heavy laser" + icon_state = "impact_beam_heavy" + fire_sound = 'sound/weapons/lasercannonfire.ogg' + pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE + damage = 60 + armor_penetration = 30 + light_range = 3 + light_power = 1 + light_color = "#FF0D00" + +/obj/item/projectile/energy/mob/midlaser + name = "laser" + icon_state = "impact_laser" + fire_sound = 'sound/weapons/Laser.ogg' + pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE + damage = 40 + armor_penetration = 10 + damage_type = BURN + check_armour = "laser" + + +/obj/item/projectile/energy/mob/drone + name = "laser" + icon_state = "impact_laser" + fire_sound = 'sound/weapons/Laser.ogg' + pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE + damage = 10 + damage_type = BURN + check_armour = "laser" \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index 1bf374deae..7011d52090 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4638,16 +4638,21 @@ #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\fleshtaker.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\xenomorph.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\xenomorph_abilities.dm" +#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\animal\spider.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\animal\space\alien.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\animal\space\mouse_army_ch.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\horror\Master.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\humanoid\cultboss.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\humanoid\cultist_ch.dm" +#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\humanoid\mercenary.dm" +#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\humanoid\pirate.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\disbot.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\drones\combat_drone.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\hivebot\boss.dm" +#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\hivebot\hivebot.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\hivebot\precusor_hivebots.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\hivebot\tank.dm" +#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\combat.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\gygax.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\phazon.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\occult\constructs\juggernaut.dm" @@ -4670,6 +4675,7 @@ #include "modular_chomp\code\modules\power\cells\esoteric_cells.dm" #include "modular_chomp\code\modules\power\cells\power_cells.dm" #include "modular_chomp\code\modules\projectiles\gun.dm" +#include "modular_chomp\code\modules\projectiles\mob.dm" #include "modular_chomp\code\modules\projectiles\clockwork\clockwork_guns_ch.dm" #include "modular_chomp\code\modules\projectiles\guns\phase.dm" #include "modular_chomp\code\modules\reagents\machinery\dispenser\chem_synthesizer_ch.dm"