cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-22 04:38:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

gets rid of my lazy fix for the glory kill

Browse Source
This commit is contained in:
crazyraio2
2020-07-31 12:37:45 -03:00
parent 0d484662a1
commit aa8d28a86b
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sandcode/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+4 -2
View File
@@ -116,7 +116,7 @@
else
for(var/mob/living/M in view(src, vision_range))
if(M.client)
M.stop_sound_channel(CHANNEL_BOSSMUSIC)
M.stop_sound_channel(CHANNEL_AMBIENCE)
animate(src, color = initial(color), time = 3)
desc = initial(desc)
var/datum/status_effect/crusher_damage/C = has_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING)
@@ -134,13 +134,15 @@
..()
/mob/living/simple_animal/hostile/megafauna/AltClick(mob/living/carbon/slayer)
if(!slayer.canUseTopic(src, TRUE))
return
if(glorykill)
if(ranged)
if(ranged_cooldown >= world.time)
ranged_cooldown += 10
else
ranged_cooldown = 10 + world.time
if(do_after(slayer, 10, needhand = TRUE, target = src, progress = FALSE) && (stat != DEAD))
if(do_mob(slayer, src, 10) && (stat != DEAD))
var/message
if(!slayer.get_active_held_item() || (!istype(slayer.get_active_held_item(), /obj/item/kinetic_crusher) && !istype(slayer.get_active_held_item(), /obj/item/gun/energy/kinetic_accelerator)))
message = pick(glorymessageshand)
sandcode/code/modules/mob/living/simple_animal/hostile/mining_mobs/miningmobs.dm
+3 -7
View File
@@ -34,14 +34,10 @@
..(gibbed)
/mob/living/simple_animal/hostile/asteroid/AltClick(mob/living/carbon/slayer)
if(!slayer.canUseTopic(src, TRUE))
return
if(glorykill)
if(ranged)
if(ranged_cooldown >= world.time)
ranged_cooldown += 10
else
ranged_cooldown = 10 + world.time
if(glorykill)
if(do_after(slayer, 10, needhand = TRUE, target = src, progress = FALSE) && (stat != DEAD))
if(do_mob(slayer, src, 10) && (stat != DEAD))
var/message
if(!slayer.get_active_held_item() || (!istype(slayer.get_active_held_item(), /obj/item/kinetic_crusher) && !istype(slayer.get_active_held_item(), /obj/item/gun/energy/kinetic_accelerator)))
message = pick(glorymessageshand)