From 429fe4a35eb87a9bee5c8be8cdad3b8e6b708163 Mon Sep 17 00:00:00 2001 From: MLGTASTICa Date: Sun, 11 Aug 2024 19:12:11 +0300 Subject: [PATCH] a --- code/controllers/subsystems/bullets.dm | 33 +++++++++++++------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/code/controllers/subsystems/bullets.dm b/code/controllers/subsystems/bullets.dm index dbcb7ce18..b6f312e9e 100644 --- a/code/controllers/subsystems/bullets.dm +++ b/code/controllers/subsystems/bullets.dm @@ -236,29 +236,28 @@ SUBSYSTEM_DEF(bullets) //message_admins("stepX:[stepX] , stepY : [stepY]") - if(canContinue != PROJECTILE_CONTINUE) - var/a = round((stepX)/32) - var/b = round((stepY)/32) - var/c = round((currentZ)/32) - var/turf/turfer = locate(a,b,c) - var/atom/movable/special = new /obj/item() - message_admins("stepX:[stepX] , stepY : [stepY]") - message_admins("MovTurf ----- X: [movementTurf.x] Y:[movementTurf.y] Z:[movementTurf.z]") - message_admins("VisTurf ----- X: [a] Y:[b] Z:[c]") - special.forceMove(turfer) - special.icon = projectile.icon - special.icon_state = projectile.icon_state - special.pixel_x = round((stepX))%32 - 16 - special.pixel_y = round((stepY))%32 - 16 - special.transform = projectile.transform - dataReference.lifetime = 0 - break currentX = dataReference.globalX currentY = dataReference.globalY currentZ = dataReference.globalZ var/bulletTime = SSbullets.wait *(dataReference.pixelSpeed / (dataReference.pixelSpeed + pixelTotal)) + if(canContinue != PROJECTILE_CONTINUE) + var/a = round((stepX)/32) + var/b = round((stepY)/32) + var/c = round(currentZ/32) + var/turf/turfer = locate(a,b,c) + var/atom/movable/special = new /obj/item() + message_admins("stepX:[stepX] , stepY : [stepY]") + message_admins("MovTurf ----- X: [movementTurf.x] Y:[movementTurf.y] Z:[movementTurf.z]") + message_admins("VisTurf ----- X: [a] Y:[b] Z:[c]") + special.forceMove(turfer) + special.icon = projectile.icon + special.icon_state = projectile.icon_state + special.pixel_x = round((stepX))%32 - 16 + special.pixel_y = round((stepY))%32 - 16 + special.transform = projectile.transform + animate(projectile, bulletTime, pixel_x = dataReference.globalX%PPT - HPPT, pixel_y = dataReference.globalY%PPT - HPPT, flags = ANIMATION_END_NOW) if(dataReference.lifetime < 1)