From b00b41bbf93a276906517d2de855e9f212c4568e Mon Sep 17 00:00:00 2001 From: phil235 Date: Thu, 25 Sep 2014 19:11:31 +0200 Subject: [PATCH 1/6] Replacing clone damage descriptions by "cellular damage". --- code/game/machinery/Sleeper.dm | 2 +- code/game/mecha/equipment/tools/medical_tools.dm | 2 +- code/game/objects/items/devices/scanners.dm | 2 +- code/modules/mob/living/carbon/human/examine.dm | 4 ++-- code/modules/reagents/Chemistry-Reagents.dm | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index ba6c745cf26..7e5801c56fe 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -182,7 +182,7 @@ dat += "
Paralysis Summary:
[round(occupant.paralysis)]% [occupant.paralysis ? "([round(occupant.paralysis / 4)] seconds left)" : ""]
" if(occupant.getCloneLoss()) - dat += "
Subject appears to have been imperfectly cloned.
" + dat += "
Subject appears to have cellular damage.
" if(occupant.getBrainLoss()) dat += "
Significant brain damage detected.
" if(occupant.reagents.reagent_list.len) diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index 552d52f599c..4cfc457473d 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -169,7 +169,7 @@ Respiratory Damage: [occupant.getOxyLoss()]%
Toxin Content: [occupant.getToxLoss()]%
Burn Severity: [occupant.getFireLoss()]%
- [occupant.getCloneLoss() ? "Subject appears to have been imperfectly cloned." : ""]
+ [occupant.getCloneLoss() ? "Subject appears to have cellular damage." : ""]
[occupant.getBrainLoss() ? "Significant brain damage detected." : ""]
"} diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 2fee9ea7431..b68585f61ca 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -145,7 +145,7 @@ MASS SPECTROMETER user.show_message("Subject appears to be suffering from fatigue.", 1) if (M.getCloneLoss()) - user.show_message("Subject appears to have been imperfectly cloned.", 1) + user.show_message("Subject appears to have [M.getCloneLoss() < 30 ? "severe" : "minor"] cellular damage.", 1) for(var/datum/disease/D in M.viruses) if(!D.hidden[SCANNER]) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 15d91bfb4ed..d2249e11184 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -220,9 +220,9 @@ temp = getCloneLoss() if(temp) if(temp < 30) - msg += "[t_He] [t_has] minor genetic deformities.\n" + msg += "[t_He] [t_has] minor cellular damage.\n" else - msg += "[t_He] [t_has] severe genetic deformities.\n" + msg += "[t_He] [t_has] severe cellular damage.\n" if(fire_stacks > 0) msg += "[t_He] [t_is] covered in something flammable.\n" diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 4ec642bdadf..f60fc499f5a 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1168,7 +1168,7 @@ datum/reagent/clonexadone/on_mob_life(var/mob/living/M as mob) datum/reagent/rezadone name = "Rezadone" id = "rezadone" - description = "A powder derived from fish toxin, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects." + description = "A powder derived from fish toxin, this substance can effectively treat cellular damage in humanoids, though excessive consumption has side effects." reagent_state = SOLID color = "#669900" // rgb: 102, 153, 0 From 1d9834b159d5e39f6c972fa835cdf08e70965edb Mon Sep 17 00:00:00 2001 From: phil235 Date: Thu, 25 Sep 2014 20:06:01 +0200 Subject: [PATCH 2/6] Adding changelog and correcting a typo --- code/game/objects/items/devices/scanners.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index b68585f61ca..cd44cf0ae72 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -145,7 +145,7 @@ MASS SPECTROMETER user.show_message("Subject appears to be suffering from fatigue.", 1) if (M.getCloneLoss()) - user.show_message("Subject appears to have [M.getCloneLoss() < 30 ? "severe" : "minor"] cellular damage.", 1) + user.show_message("Subject appears to have [M.getCloneLoss() > 30 ? "severe" : "minor"] cellular damage.", 1) for(var/datum/disease/D in M.viruses) if(!D.hidden[SCANNER]) From bfd604d9b2fca5081d22e659f2ab2a65d621766e Mon Sep 17 00:00:00 2001 From: phil235 Date: Fri, 26 Sep 2014 20:18:56 +0200 Subject: [PATCH 3/6] changelog --- tgstation.dme | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/tgstation.dme b/tgstation.dme index 5ee02581787..345fc7d4793 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6,6 +6,48 @@ // BEGIN_FILE_DIR #define FILE_DIR . +#define FILE_DIR "html" +#define FILE_DIR "icons" +#define FILE_DIR "icons/ass" +#define FILE_DIR "icons/effects" +#define FILE_DIR "icons/mecha" +#define FILE_DIR "icons/misc" +#define FILE_DIR "icons/mob" +#define FILE_DIR "icons/obj" +#define FILE_DIR "icons/obj/assemblies" +#define FILE_DIR "icons/obj/atmospherics" +#define FILE_DIR "icons/obj/clothing" +#define FILE_DIR "icons/obj/doors" +#define FILE_DIR "icons/obj/flora" +#define FILE_DIR "icons/obj/machines" +#define FILE_DIR "icons/obj/pipes" +#define FILE_DIR "icons/obj/power_cond" +#define FILE_DIR "icons/pda_icons" +#define FILE_DIR "icons/spideros_icons" +#define FILE_DIR "icons/stamp_icons" +#define FILE_DIR "icons/Testing" +#define FILE_DIR "icons/turf" +#define FILE_DIR "icons/vending_icons" +#define FILE_DIR "nano" +#define FILE_DIR "nano/images" +#define FILE_DIR "sound" +#define FILE_DIR "sound/AI" +#define FILE_DIR "sound/ambience" +#define FILE_DIR "sound/effects" +#define FILE_DIR "sound/hallucinations" +#define FILE_DIR "sound/items" +#define FILE_DIR "sound/machines" +#define FILE_DIR "sound/mecha" +#define FILE_DIR "sound/misc" +#define FILE_DIR "sound/piano" +#define FILE_DIR "sound/violin" +#define FILE_DIR "sound/voice" +#define FILE_DIR "sound/voice/complionator" +#define FILE_DIR "sound/vox_fem" +#define FILE_DIR "sound/weapons" +#define FILE_DIR "tools" +#define FILE_DIR "tools/AddToChangelog" +#define FILE_DIR "tools/AddToChangelog/AddToChangelog" // END_FILE_DIR // BEGIN_PREFERENCES @@ -1287,6 +1329,7 @@ #include "code\modules\telesci\telesci_computer.dm" #include "code\WorkInProgress\buildmode.dm" #include "code\WorkInProgress\explosion_particles.dm" +#include "html\changelogs\phil235-PR-4975.yml.dm" #include "interface\interface.dm" #include "interface\stylesheet.dm" #include "interface\skin.dmf" From e59cc2af529388282f3bdde10fa3f02eead5374d Mon Sep 17 00:00:00 2001 From: phil235 Date: Fri, 26 Sep 2014 20:35:27 +0200 Subject: [PATCH 4/6] adding changelog --- html/changelogs/phil235-PR-4975.yml.dm | 6 ++++ tgstation.dme | 43 -------------------------- 2 files changed, 6 insertions(+), 43 deletions(-) create mode 100644 html/changelogs/phil235-PR-4975.yml.dm diff --git a/html/changelogs/phil235-PR-4975.yml.dm b/html/changelogs/phil235-PR-4975.yml.dm new file mode 100644 index 00000000000..d0a758c2e93 --- /dev/null +++ b/html/changelogs/phil235-PR-4975.yml.dm @@ -0,0 +1,6 @@ +author: phil235 + +delete-after: True + +changes: + - experiment: Changed all clone damage descriptions to use the term cellular damage to avoid confusion with genetics mutations. diff --git a/tgstation.dme b/tgstation.dme index 345fc7d4793..5ee02581787 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6,48 +6,6 @@ // BEGIN_FILE_DIR #define FILE_DIR . -#define FILE_DIR "html" -#define FILE_DIR "icons" -#define FILE_DIR "icons/ass" -#define FILE_DIR "icons/effects" -#define FILE_DIR "icons/mecha" -#define FILE_DIR "icons/misc" -#define FILE_DIR "icons/mob" -#define FILE_DIR "icons/obj" -#define FILE_DIR "icons/obj/assemblies" -#define FILE_DIR "icons/obj/atmospherics" -#define FILE_DIR "icons/obj/clothing" -#define FILE_DIR "icons/obj/doors" -#define FILE_DIR "icons/obj/flora" -#define FILE_DIR "icons/obj/machines" -#define FILE_DIR "icons/obj/pipes" -#define FILE_DIR "icons/obj/power_cond" -#define FILE_DIR "icons/pda_icons" -#define FILE_DIR "icons/spideros_icons" -#define FILE_DIR "icons/stamp_icons" -#define FILE_DIR "icons/Testing" -#define FILE_DIR "icons/turf" -#define FILE_DIR "icons/vending_icons" -#define FILE_DIR "nano" -#define FILE_DIR "nano/images" -#define FILE_DIR "sound" -#define FILE_DIR "sound/AI" -#define FILE_DIR "sound/ambience" -#define FILE_DIR "sound/effects" -#define FILE_DIR "sound/hallucinations" -#define FILE_DIR "sound/items" -#define FILE_DIR "sound/machines" -#define FILE_DIR "sound/mecha" -#define FILE_DIR "sound/misc" -#define FILE_DIR "sound/piano" -#define FILE_DIR "sound/violin" -#define FILE_DIR "sound/voice" -#define FILE_DIR "sound/voice/complionator" -#define FILE_DIR "sound/vox_fem" -#define FILE_DIR "sound/weapons" -#define FILE_DIR "tools" -#define FILE_DIR "tools/AddToChangelog" -#define FILE_DIR "tools/AddToChangelog/AddToChangelog" // END_FILE_DIR // BEGIN_PREFERENCES @@ -1329,7 +1287,6 @@ #include "code\modules\telesci\telesci_computer.dm" #include "code\WorkInProgress\buildmode.dm" #include "code\WorkInProgress\explosion_particles.dm" -#include "html\changelogs\phil235-PR-4975.yml.dm" #include "interface\interface.dm" #include "interface\stylesheet.dm" #include "interface\skin.dmf" From f107f3de38874ace0b085324fbf9cba651764162 Mon Sep 17 00:00:00 2001 From: phil235 Date: Fri, 26 Sep 2014 20:40:58 +0200 Subject: [PATCH 5/6] please fix. --- html/changelogs/phil235-PR-4975.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/phil235-PR-4975.yml diff --git a/html/changelogs/phil235-PR-4975.yml b/html/changelogs/phil235-PR-4975.yml new file mode 100644 index 00000000000..d0a758c2e93 --- /dev/null +++ b/html/changelogs/phil235-PR-4975.yml @@ -0,0 +1,6 @@ +author: phil235 + +delete-after: True + +changes: + - experiment: Changed all clone damage descriptions to use the term cellular damage to avoid confusion with genetics mutations. From e63633c0edf9476739d9b09679dbb07db16ce2dc Mon Sep 17 00:00:00 2001 From: phil235 Date: Fri, 26 Sep 2014 20:46:44 +0200 Subject: [PATCH 6/6] removing the .yml.dm file --- html/changelogs/phil235-PR-4975.yml.dm | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 html/changelogs/phil235-PR-4975.yml.dm diff --git a/html/changelogs/phil235-PR-4975.yml.dm b/html/changelogs/phil235-PR-4975.yml.dm deleted file mode 100644 index d0a758c2e93..00000000000 --- a/html/changelogs/phil235-PR-4975.yml.dm +++ /dev/null @@ -1,6 +0,0 @@ -author: phil235 - -delete-after: True - -changes: - - experiment: Changed all clone damage descriptions to use the term cellular damage to avoid confusion with genetics mutations.