cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-23 00:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

New Map Roof (#2484)

Browse Source 
Fixes the command roof
De-randomizes fall damage. Fall damage is now the base variable * z_levels_fallen * species.fallmod + rand(-base variable/2, base variable/2)
Incorporates the first try at reasonable z_velocity. Base variable + 5(z_levels_fallen^2)
Adds toilets to the main level
Adds Poly.
This commit is contained in:
LordFowl
2017-05-27 19:45:25 -04:00
committed by skull132
parent c9e5c8b5c4
commit 766f42ef2d
4 changed files with 135 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/area/Space Station 13 areas.dm
View File

@@ -982,7 +982,7 @@ area/space/atmosalert()
allow_nightmode = 1
/area/crew_quarters/locker/locker_toilet
name = "\improper Locker Toilets"
name = "\improper Main Level Toilets"
icon_state = "toilet"
sound_env = SMALL_ENCLOSED

45
code/modules/multiz/movement.dm
View File

@@ -297,10 +297,11 @@
visible_message("\The [src] falls and lands on \the [loc]!",
"With a loud thud, you land on \the [loc]!", "You hear a thud!")
var/damage = 30 * levels_fallen
apply_damage(rand(0, damage), BRUTE)
apply_damage(rand(0, damage), BRUTE)
apply_damage(rand(0, damage), BRUTE)
var/z_velocity = 5*(levels_fallen**2)
var/damage = ((30 + z_velocity) + rand(-15,15))
apply_damage(damage, BRUTE)
apply_damage(damage, BRUTE)
apply_damage(damage, BRUTE)
// The only piece of duplicate code. I was so close. Soooo close. :ree:
if(!isSynthetic())
@@ -327,13 +328,14 @@
visible_message("\The [src] falls and lands on \the [loc]!",
"With a loud thud, you land on \the [loc]!", "You hear a thud!")
var/damage = 25 * species.fall_mod * levels_fallen
var/z_velocity = 5*(levels_fallen**2)
var/damage = (((25 * species.fall_mod) + z_velocity) + rand(-13,13))
if(prob(20)) //landed on their head
apply_damage(rand(0, damage), BRUTE, "head")
apply_damage(damage, BRUTE, "head")
else if(prob(20)) //landed on their arms
apply_damage(rand(0, damage), BRUTE, "l_arm")
apply_damage(rand(0, damage), BRUTE, "r_arm")
apply_damage(damage, BRUTE, "l_arm")
apply_damage(damage, BRUTE, "r_arm")
if(prob(50))
apply_damage(rand(0, (damage/2)), BRUTE, "r_hand")
@@ -351,7 +353,7 @@
if(prob(50))
apply_damage(rand(0, (damage/2)), BRUTE, "groin")
apply_damage(rand(0, damage), BRUTE, "chest")
apply_damage(damage, BRUTE, "chest")
Weaken(rand(0, damage/2))
@@ -381,11 +383,12 @@
if (!.)
return
var/damage = 40 * levels_fallen
take_damage(rand(0, damage))
take_damage(rand(0, damage))
take_damage(rand(0, damage))
take_damage(rand(0, damage))
var/z_velocity = 5*(levels_fallen**2)
var/damage = ((40 + z_velocity) + rand(-20,20))
take_damage(damage)
take_damage(damage)
take_damage(damage)
take_damage(damage)
playsound(loc, "sound/effects/bang.ogg", 100, 1)
playsound(loc, "sound/effects/bamf.ogg", 100, 1)
@@ -395,11 +398,12 @@
if (!.)
return
var/damage = 35 * levels_fallen
health -= (rand(0, damage) * brute_dam_coeff)
health -= (rand(0, damage) * brute_dam_coeff)
health -= (rand(0, damage) * brute_dam_coeff)
health -= (rand(0, damage) * brute_dam_coeff)
var/z_velocity = 5*(levels_fallen**2)
var/damage = ((35 + z_velocity) + rand(-18,18))
health -= (damage * brute_dam_coeff)
health -= (damage * brute_dam_coeff)
health -= (damage * brute_dam_coeff)
health -= (damage * brute_dam_coeff)
playsound(loc, "sound/effects/clang.ogg", 75, 1)
@@ -427,7 +431,8 @@
var/weight = fall_specs[1]
var/fall_force = fall_specs[2]
var/speed = levels_fallen * throw_speed
var/z_velocity = 5*(levels_fallen**2)
var/speed = z_velocity + throw_speed
var/mass = (weight / THROWNOBJ_KNOCKBACK_DIVISOR) + density + opacity
var/momentum = speed * mass
var/damage = round(fall_force * (speed / THROWNOBJ_KNOCKBACK_DIVISOR) * momentum)