diff --git a/code/controllers/ProcessScheduler/core/_stubs.dm b/code/controllers/ProcessScheduler/core/_stubs.dm index 3615c12f192..1aa2c8efb8c 100644 --- a/code/controllers/ProcessScheduler/core/_stubs.dm +++ b/code/controllers/ProcessScheduler/core/_stubs.dm @@ -14,6 +14,6 @@ */ /proc/logTheThing(type, source, target, text, diaryType) if(diaryType) - world << "Diary: \[[diaryType]:[type]] [text]" + log_debug("Diary: \[[diaryType]:[type]] [text]") else - world << "Log: \[[type]] [text]" + log_debug("Log: \[[type]] [text]") diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index caa6e78a7f4..027a462070b 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -287,11 +287,11 @@ var/list/mob/living/forced_ambiance_list = new return if(H.m_intent == "run") - H.AdjustStunned(2) - H.AdjustWeakened(2) + H.AdjustStunned(6) + H.AdjustWeakened(6) else - H.AdjustStunned(1) - H.AdjustWeakened(1) + H.AdjustStunned(3) + H.AdjustWeakened(3) mob << "The sudden appearance of gravity makes you fall to the floor!" /area/proc/prison_break() diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index f821ab1db69..2e36eead756 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/code/game/objects/items/weapons/material/twohanded.dm @@ -115,9 +115,9 @@ force = 10 w_class = 4.0 slot_flags = SLOT_BACK - force_wielded = 0.75 // 22 when wielded with hardness 15 (glass) - unwielded_force_divisor = 0.65 // 14 when unwielded based on above - thrown_force_divisor = 1.5 // 20 when thrown with weight 15 (glass) + force_divisor = 0.75 // 22 when wielded with hardness 15 (glass) + unwielded_force_divisor = 0.375 + thrown_force_divisor = 1.5 // 20 when thrown with weight 15 (glass) throw_speed = 3 edge = 0 sharp = 1 diff --git a/html/changelog.html b/html/changelog.html index e0ee2e5c88c..1723a560d03 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -53,6 +53,16 @@ -->
+

08 June 2016

+

Yoshax updated:

+ +

07 June 2016

Datraen updated: