From 8fc1dc9c2994b48ec77aa8ac21c4449f8b0e8fc9 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 28 Feb 2021 00:40:04 -0700 Subject: [PATCH] changes --- code/game/objects/effects/decals/misc.dm | 1 + code/modules/mob/living/say.dm | 2 +- code/modules/movespeed/modifiers/status_effects.dm | 2 +- code/modules/projectiles/guns/energy/energy_gun.dm | 2 ++ code/modules/reagents/reagent_containers/spray.dm | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm index 514fcdd68a..53ad432121 100644 --- a/code/game/objects/effects/decals/misc.dm +++ b/code/game/objects/effects/decals/misc.dm @@ -59,6 +59,7 @@ hit_thing(AM) /obj/effect/decal/chempuff/proc/run(atom/target) + set waitfor = FALSE for(var/i in 1 to range) range_left-- if(!isturf(loc)) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index d72b8c904a..148c66043f 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -308,7 +308,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA INVOKE_ASYNC(GLOBAL_PROC, /.proc/flick_overlay, I, speech_bubble_recipients, 30) -/atom/movable/proc/process_yelling(list/already_heard, rendered, atom/movable/speaker, datum/language/message_language, list/spans, message_mode, obj/source) +/atom/movable/proc/process_yelling(list/already_heard, rendered, atom/movable/speaker, datum/language/message_language, message, list/spans, message_mode, obj/source) var/list/overhearing = list() #warn todo: yelling overhearing -= already_heard diff --git a/code/modules/movespeed/modifiers/status_effects.dm b/code/modules/movespeed/modifiers/status_effects.dm index d174524898..ed8eaf1303 100644 --- a/code/modules/movespeed/modifiers/status_effects.dm +++ b/code/modules/movespeed/modifiers/status_effects.dm @@ -43,7 +43,7 @@ multiplicative_slowdown = -2 blacklisted_movetypes= FLYING|FLOATING -/datum/movespeed_modifier/status_effect/staggered +/datum/movespeed_modifier/status_effect/stagger variable = TRUE /datum/movespeed_modifier/status_effect/off_balance diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm index ae78423813..294040b040 100644 --- a/code/modules/projectiles/guns/energy/energy_gun.dm +++ b/code/modules/projectiles/guns/energy/energy_gun.dm @@ -54,6 +54,8 @@ ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/ion/hos, /obj/item/ammo_casing/energy/electrode/hos) ammo_x_offset = 4 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF + var/last_altfire = 0 + var/altfire_delay = 0 /obj/item/gun/energy/e_gun/hos/altafterattack(atom/target, mob/user, proximity_flag, params) . = TRUE diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 6f4b0b37e8..3f62829b32 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -75,6 +75,7 @@ var/range = clamp(get_dist(src, A), 1, current_range) var/wait_step = CEILING(spray_delay * INVERSE(range), world.tick_lag) var/obj/effect/decal/chempuff/D = new /obj/effect/decal/chempuff(get_turf(src), stream_mode, wait_step, range, stream_mode? 1 : range) + var/turf/T = get_turf(src) log_reagent("SPRAY: [key_name(usr)] fired [src] ([REF(src)]) [COORD(T)] at [A] ([REF(A)]) [COORD(A)] (chempuff: [D.reagents.log_list()])") D.create_reagents(amount_per_transfer_from_this, NONE, NO_REAGENTS_VALUE) if(stream_mode)