Yelling works

This commit is contained in:
silicons
2021-06-13 00:50:00 -07:00
parent 2f9492945d
commit b6bb20842f
7 changed files with 44 additions and 45 deletions
+2
View File
@@ -57,6 +57,8 @@
/// Should we use tooltips, if the thing does not have the code implemented `get_tooltip_data()`, it will default to examine(src)
var/tooltips = FALSE
/// How loudly we yell
var/yell_power = 35
/atom/movable/Initialize(mapload)
+5 -3
View File
@@ -9,7 +9,9 @@
wave_explosion_block = 10
wave_explosion_multiply = 0.75
/// How much we block yelling
var/yelling_resistance = 40
var/yelling_resistance = 15
/// how much of inbound yelling to dampen
var/yelling_dampen = 0.5
/turf/closed/Initialize()
. = ..()
@@ -217,5 +219,5 @@
icon_state = "ice"
canSmoothWith = list(/turf/closed/indestructible/rock/glacierrock/blue)
/turf/closed/get_yelling_resistance()
return yelling_resistance
/turf/closed/get_yelling_resistance(power)
return yelling_resistance + (power * yelling_dampen)
+1 -1
View File
@@ -613,7 +613,7 @@ GLOBAL_LIST_EMPTY(station_turfs)
if(. != BULLET_ACT_FORCE_PIERCE)
. = BULLET_ACT_TURF
/turf/proc/get_yelling_resistance()
/turf/proc/get_yelling_resistance(power)
. = 0
// don't bother checking fulltile, we don't need accuracy
var/obj/structure/window/W = locate() in src