From 91ab2496818e9e3023b5680326d98d208c4476ca Mon Sep 17 00:00:00 2001 From: Segrain Date: Wed, 26 Jun 2013 16:11:10 +0300 Subject: [PATCH 1/7] Helper update. --- code/__HELPERS/time.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm index 6b4dcda2c46..51f56d9d122 100644 --- a/code/__HELPERS/time.dm +++ b/code/__HELPERS/time.dm @@ -1,6 +1,6 @@ //Returns the world time in english -proc/worldtime2text() - return "[round(world.time / 36000)+12]:[(world.time / 600 % 60) < 10 ? add_zero(world.time / 600 % 60, 1) : world.time / 600 % 60]" +proc/worldtime2text(time = world.time) + return "[round(time / 36000)+12]:[(time / 600 % 60) < 10 ? add_zero(time / 600 % 60, 1) : time / 600 % 60]" proc/time_stamp() return time2text(world.timeofday, "hh:mm:ss") From a944cda68e4f30c763e2092713c63ab881c245a3 Mon Sep 17 00:00:00 2001 From: Segrain Date: Wed, 26 Jun 2013 16:12:32 +0300 Subject: [PATCH 2/7] Autopsy fix. --- code/modules/organs/organ_external.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index f5092f59325..cecf813dbce 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -95,7 +95,7 @@ if(status & ORGAN_BROKEN && prob(40) && brute) owner.emote("scream") //getting hit on broken hand hurts if(used_weapon) - add_autopsy_data(used_weapon, brute + burn) + add_autopsy_data("[used_weapon]", brute + burn) var/can_cut = (prob(brute*2) || sharp) && !(status & ORGAN_ROBOT) // If the limbs can break, make sure we don't exceed the maximum damage a limb can take before breaking From d5620f9bb074db72d94a8d3e4dc34df38c624013 Mon Sep 17 00:00:00 2001 From: Segrain Date: Wed, 26 Jun 2013 16:18:08 +0300 Subject: [PATCH 3/7] Changelog update. --- html/changelog.html | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/html/changelog.html b/html/changelog.html index b7a3631fe75..56d036eff25 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -57,6 +57,15 @@ Stuff which is in development and not yet visible to players or just code relate (ie. code improvements for expandability, etc.) should not be listed here. They should be listed in the changelog upon commit though. Thanks. --> +
+

26.06.2013

+

Segrain updated:

+
    +
  • Autopsy scanner properly displays time of wound infliction and death.
    • +
  • Autopsy scanner properly displays wounds by projectile weapons.
    • +
+
+

June 22nd 2013

Cael_Aislinn updated:

From 333e59190c84d945966b44a76907379684628b4a Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 27 Jun 2013 02:09:36 -0700 Subject: [PATCH 4/7] Added minimum damage for cutting wounds to bleed visibly. --- code/modules/organs/wound.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/organs/wound.dm b/code/modules/organs/wound.dm index 90909a3f62d..1d1f61ec918 100644 --- a/code/modules/organs/wound.dm +++ b/code/modules/organs/wound.dm @@ -145,7 +145,7 @@ proc/bleeding() // internal wounds don't bleed in the sense of this function - return (!(bandaged||clamped) && (damage_type == BRUISE && damage >= 20 || damage_type == CUT) && current_stage <= max_bleeding_stage && !src.internal) + return (!(bandaged||clamped) && (damage_type == BRUISE && damage >= 20 || damage_type == CUT && damage >= 10) && current_stage <= max_bleeding_stage && !src.internal) /** CUTS **/ /datum/wound/cut/small From 6d7669811615bc62f237b5963d5c12228d3cd066 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 27 Jun 2013 02:33:57 -0700 Subject: [PATCH 5/7] Organ regeneration nerf. --- config/game_options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/game_options.txt b/config/game_options.txt index 915612c7418..98fcad7f74b 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -19,7 +19,7 @@ ORGAN_HEALTH_MULTIPLIER 100 ## multiplier which influences how fast organs regenerate naturally ## 100 means normal, 50 means half -ORGAN_REGENERATION_MULTIPLIER 200 +ORGAN_REGENERATION_MULTIPLIER 20 ### REVIVAL ### From b270c6060df4b0ea45739ce57f1720344d2ec866 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 27 Jun 2013 06:22:01 -0700 Subject: [PATCH 6/7] Fixes #3025 --- code/modules/mob/mob.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 253e4ee43dc..bd1258cd942 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -714,7 +714,7 @@ note dizziness decrements automatically in the mob's Life() proc. stat(null,"MasterController-ERROR") - if(spell_list.len) + if(spell_list && spell_list.len) for(var/obj/effect/proc_holder/spell/S in spell_list) switch(S.charge_type) if("recharge") From 8eec1d5379b707549b89d24899526d9d8dc9763d Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 27 Jun 2013 06:30:17 -0700 Subject: [PATCH 7/7] Fixes #3008 --- code/modules/research/xenoarchaeology/finds/finds.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm index 8d988d43a32..5b90ba6a793 100644 --- a/code/modules/research/xenoarchaeology/finds/finds.dm +++ b/code/modules/research/xenoarchaeology/finds/finds.dm @@ -520,7 +520,7 @@ new_item.name = name new_item.desc = src.desc - if(talkative) + if(talkative && istype(new_item,/obj/item/weapon)) new_item.listening_to_players = 1 if(prob(25)) new_item.speaking_to_players = 1