mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-22 03:27:46 +01:00
Changes wall damage from being (usually) 25 brute to 12 and doesnt add a stun to it (#15950)
* Prs this without consulting people like a boss * Remove stungus womp
This commit is contained in:
@@ -301,9 +301,10 @@
|
||||
|
||||
// Called when turf is hit by a thrown object
|
||||
/turf/hitby(atom/movable/AM as mob|obj, var/speed)
|
||||
if(src.density)
|
||||
spawn(2)
|
||||
step(AM, turn(AM.last_move, 180))
|
||||
if(density)
|
||||
if(!has_gravity(AM)) //Checked a different codebase for reference. Turns out it's only supposed to happen in no-gravity
|
||||
spawn(2)
|
||||
step(AM, turn(AM.last_move, 180)) //This makes it float away after hitting a wall in 0G
|
||||
if(isliving(AM))
|
||||
var/mob/living/M = AM
|
||||
M.turf_collision(src, speed)
|
||||
|
||||
@@ -370,7 +370,9 @@
|
||||
|
||||
//This is called when the mob is thrown into a dense turf
|
||||
/mob/living/proc/turf_collision(var/turf/T, var/speed)
|
||||
src.take_organ_damage(speed*5)
|
||||
src.take_organ_damage(12) // used to be 5 * speed. That's a default of 25 and I dont see anything ever changing the "speed" value.
|
||||
//src.Weaken(3) // That is absurdly high so im just setting it to a flat 12 with a bit of stun ontop. //Stun is too dangerous
|
||||
playsound(src, get_sfx("punch"), 50) //ouch sound
|
||||
|
||||
/mob/living/proc/near_wall(var/direction,var/distance=1)
|
||||
var/turf/T = get_step(get_turf(src),direction)
|
||||
|
||||
Reference in New Issue
Block a user