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

Trying to remove Mob Hardstuns (#7266)

Browse Source
This commit is contained in:
FluffMedic
2023-12-12 14:09:30 -05:00
committed by GitHub
parent 41e8a766b9
commit f320278b8d
15 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/imperion.dm
View File

@@ -244,6 +244,7 @@
special_attack_min_range = 1
special_attack_max_range = 9
special_attack_cooldown = 12 SECONDS
melee_attack_delay = 2 SECOND
/mob/living/simple_mob/mechanical/mecha/imperion/phase4/proc/electric_defense(atom/target)
set waitfor = FALSE
@@ -386,7 +387,7 @@
/obj/item/clothing/suit/armor/tesla/vistor = 60,
/obj/item/clothing/suit/armor/tesla/vistor = 60,
/obj/item/shield_projector/rectangle/automatic/orange = 10,
/obj/item/shield_projector/rectangle/automatic/imperion = 1,
/obj/item/shield_projector/rectangle/automatic/imperion = 0.5,
/obj/item/clothing/head/vrwizard = 60,
/obj/item/clothing/suit/vrwizard = 60,
/obj/item/weapon/gun/magic/firestaff/vrwizard/fire = 60,
@@ -404,23 +405,6 @@
)
/mob/living/simple_mob/mechanical/mecha/imperion/phase5/proc/electric_defense(atom/target)
var/turf/T = get_turf(target)
visible_message(span("warning", "\The [src] fires an energetic sphere into the air!"))
playsound(src, 'sound/weapons/Laser.ogg', 50, 1)
face_atom(T)
var/obj/item/projectile/arc/microsingulo/sphere = new(loc)
sphere.old_style_target(T, src)
sphere.fire()
var/obj/item/projectile/P = new /obj/item/projectile/bullet/imperionspear(get_turf(src))
P.launch_projectile(target, BP_TORSO, src)
if(prob(50))
var/obj/item/projectile/B = new /obj/item/projectile/bullet/imperionblaster(get_turf(src))
B.launch_projectile(target, BP_TORSO, src)
else
var/obj/item/projectile/A = new /obj/item/projectile/bullet/imperiontesla(get_turf(src))
A.launch_projectile(target, BP_TORSO, src)
/mob/living/simple_mob/mechanical/mecha/imperion/phase5/proc/launch_rockets(atom/target)
var/obj/item/projectile/P = new /obj/item/projectile/bullet/imperionblaster(get_turf(src))
P.launch_projectile(target, BP_TORSO, src)
if(prob(50))
@@ -430,6 +414,17 @@
var/obj/item/projectile/A = new /obj/item/projectile/bullet/imperiontesla(get_turf(src))
A.launch_projectile(target, BP_TORSO, src)
/mob/living/simple_mob/mechanical/mecha/imperion/phase5/proc/launch_rockets(atom/target)
var/obj/item/projectile/P = new /obj/item/projectile/bullet/imperionblaster(get_turf(src))
P.launch_projectile(target, BP_TORSO, src)
sleep(1.5 SECONDS)
var/obj/item/projectile/B = new /obj/item/projectile/bullet/imperionspear(get_turf(src))
B.launch_projectile(target, BP_TORSO, src)
sleep(1.5 SECONDS)
var/obj/item/projectile/A = new /obj/item/projectile/bullet/imperiontesla(get_turf(src))
A.launch_projectile(target, BP_TORSO, src)
/mob/living/simple_mob/mechanical/mecha/imperion/phase5/proc/launch_microsingularity(atom/target)
set waitfor = FALSE
@@ -456,9 +451,11 @@
var/obj/item/projectile/P = new /obj/item/projectile/bullet/imperiontesla(get_turf(src))
P.launch_projectile(target, BP_TORSO, src)
if(prob(50))
sleep(1.5)
var/obj/item/projectile/B = new /obj/item/projectile/bullet/imperionblaster(get_turf(src))
B.launch_projectile(target, BP_TORSO, src)
else
sleep(1.5)
var/obj/item/projectile/A = new /obj/item/projectile/bullet/imperionspear(get_turf(src))
A.launch_projectile(target, BP_TORSO, src)

2
modular_chomp/code/modules/mob/living/simple_mob/subtypes/slimess/xenobio.dm Normal file
View File

@@ -0,0 +1,2 @@
/mob/living/simple_mob/slime/xenobio/yellow
projectiletype = /obj/item/projectile/energy/mob/electric_spider