cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
silicons
2021-02-28 00:40:04 -07:00
parent e43838739d
commit 8fc1dc9c29
5 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/objects/effects/decals/misc.dm
View File

@@ -59,6 +59,7 @@
hit_thing(AM) hit_thing(AM)
/obj/effect/decal/chempuff/proc/run(atom/target) /obj/effect/decal/chempuff/proc/run(atom/target)
set waitfor = FALSE
for(var/i in 1 to range) for(var/i in 1 to range)
range_left-- range_left--
if(!isturf(loc)) if(!isturf(loc))

2
code/modules/mob/living/say.dm
View File

@@ -308,7 +308,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
INVOKE_ASYNC(GLOBAL_PROC, /.proc/flick_overlay, I, speech_bubble_recipients, 30) 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() var/list/overhearing = list()
#warn todo: yelling #warn todo: yelling
overhearing -= already_heard overhearing -= already_heard

2
code/modules/movespeed/modifiers/status_effects.dm
View File

@@ -43,7 +43,7 @@
multiplicative_slowdown = -2 multiplicative_slowdown = -2
blacklisted_movetypes= FLYING|FLOATING blacklisted_movetypes= FLYING|FLOATING
/datum/movespeed_modifier/status_effect/staggered /datum/movespeed_modifier/status_effect/stagger
variable = TRUE variable = TRUE
/datum/movespeed_modifier/status_effect/off_balance /datum/movespeed_modifier/status_effect/off_balance

2
code/modules/projectiles/guns/energy/energy_gun.dm
View File

@@ -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_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 ammo_x_offset = 4
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF 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) /obj/item/gun/energy/e_gun/hos/altafterattack(atom/target, mob/user, proximity_flag, params)
. = TRUE . = TRUE

1
code/modules/reagents/reagent_containers/spray.dm
View File

@@ -75,6 +75,7 @@
var/range = clamp(get_dist(src, A), 1, current_range) var/range = clamp(get_dist(src, A), 1, current_range)
var/wait_step = CEILING(spray_delay * INVERSE(range), world.tick_lag) 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/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()])") 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) D.create_reagents(amount_per_transfer_from_this, NONE, NO_REAGENTS_VALUE)
if(stream_mode) if(stream_mode)