From eef853393e9a3af017a1f0bc2573718750227124 Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Thu, 24 Nov 2016 00:30:05 -0600 Subject: [PATCH 1/2] Defibs should revive people now. This might be an unnecessary fix, I might just have the worst luck. But I couldn't get a defib to res in 10 tries before this, got it on the second after. --- code/game/objects/items/devices/defib.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/defib.dm b/code/game/objects/items/devices/defib.dm index 7ccd1afbf0..a4b0a02c5a 100644 --- a/code/game/objects/items/devices/defib.dm +++ b/code/game/objects/items/devices/defib.dm @@ -111,7 +111,7 @@ patient.visible_message("[patient] convulses!") playsound(src.loc, 'sound/effects/sparks2.ogg', 75, 1) //Actual rezzing code - if(prob(chance) && !((world.time - patient.tod) > (10 MINUTES))) //Can only revive within a few minutes + if(prob(chance) && ((world.time - patient.timeofdeath) < (10 MINUTES))) //Can only revive within a few minutes if(!patient.client && patient.mind) //Don't force the dead person to come back if they don't want to. for(var/mob/observer/dead/ghost in player_list) if(ghost.mind == patient.mind) From 93bac86f04fe5025a7abc89e40577c8a4b2beaa1 Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Thu, 24 Nov 2016 13:14:36 -0600 Subject: [PATCH 2/2] Changelogs! --- html/changelogs/MagmaRam-Defib.yml | 36 ++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 html/changelogs/MagmaRam-Defib.yml diff --git a/html/changelogs/MagmaRam-Defib.yml b/html/changelogs/MagmaRam-Defib.yml new file mode 100644 index 0000000000..9d3f251c3f --- /dev/null +++ b/html/changelogs/MagmaRam-Defib.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: MagmaRam + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Defibrilators fixed again."