cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 23:29:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] initial throw fixing (#12231)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: C.L. <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-01-08 22:45:27 +01:00
committed by GitHub
co-authored by Kashargul C.L.
parent 4693238765
commit 441ee14971
43 changed files with 219 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_chomp/code/game/turfs/simulated/shuttlewalls.dm
+2 -1
View File
@@ -90,12 +90,13 @@
take_damage(damage)
return
/turf/simulated/shuttlewalls/hitby(atom/movable/source, var/speed=THROWFORCE_SPEED_DIVISOR)
/turf/simulated/shuttlewalls/hitby(atom/movable/source, datum/thrownthing/throwingdatum)
..()
if(ismob(source))
return
var/tforce = 0
var/speed = throwingdatum?.speed || THROWFORCE_SPEED_DIVISOR
if(isitem(source))
var/obj/item/O = source
tforce = O.throwforce * (speed/THROWFORCE_SPEED_DIVISOR)
modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/base.dm
+3 -3
View File
@@ -22,10 +22,10 @@
/mob/living/simple_mob/mechanical/mecha/eclipse/do_special_attack(atom/A)
bullet_heck(A, 3, 3)
/mob/living/simple_mob/mechanical/mecha/eclipse/hitby(obj/item/projectile/P) //removal of E net cheese
if(P == /obj/item/projectile/beam/energy_net)
/mob/living/simple_mob/mechanical/mecha/eclipse/hitby(atom/movable/source, datum/thrownthing/throwingdatum) //removal of E net cheese
if(source == /obj/item/projectile/beam/energy_net)
return
..()
..(source, throwingdatum)
/datum/ai_holder/simple_mob/intentional/three_phases
use_astar = TRUE