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

Merge branch 'upstream-master' into upstream-development

Browse Source
This commit is contained in:
Werner
2018-11-04 13:49:40 +01:00
parent c66b7c1941 2447da3d6e
commit 86a9f5cb48
25 changed files with 137 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystems/job.dm
+2 -2
View File
@@ -335,10 +335,10 @@
// Randomize nutrition and hydration. Defines are in __defines/mobs.dm
if(H.max_nutrition > 0)
H.nutrition = (rand(CREW_MINIMUM_NUTRITION, CREW_MAXIMUM_NUTRITION) * 0.01) * H.max_nutrition
H.nutrition = rand(CREW_MINIMUM_NUTRITION*100, CREW_MAXIMUM_NUTRITION*100) * H.max_nutrition * 0.01
if(H.max_hydration > 0)
H.hydration = (rand(CREW_MINIMUM_HYDRATION, CREW_MAXIMUM_HYDRATION) * 0.01) * H.max_hydration
H.hydration = rand(CREW_MINIMUM_HYDRATION*100, CREW_MAXIMUM_HYDRATION*100) * H.max_hydration * 0.01
if (!megavend)
spawn_in_storage += EquipCustomDeferred(H, H.client.prefs, custom_equip_leftovers, custom_equip_slots)