From e1d057ab0eed87a8a812813fa44f0c39604b9e3d Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Tue, 12 Apr 2016 03:21:39 -0400 Subject: [PATCH 1/7] Fixes Blind Player Preference Doing Nothing --- code/modules/client/preferences.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 4f28c69cf96..ccd7eda05e5 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1727,15 +1727,23 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts character.mutations += FAT character.mutations += OBESITY character.overeatduration = 600 + if(disabilities & DISABILITY_FLAG_NEARSIGHTED) character.dna.SetSEState(GLASSESBLOCK,1,1) character.disabilities|=NEARSIGHTED + if(disabilities & DISABILITY_FLAG_EPILEPTIC) character.dna.SetSEState(EPILEPSYBLOCK,1,1) character.disabilities|=EPILEPSY + if(disabilities & DISABILITY_FLAG_DEAF) character.dna.SetSEState(DEAFBLOCK,1,1) character.sdisabilities|=DEAF + + if(disabilities & DISABILITY_FLAG_BLIND) + character.dna.SetSEState(BLINDBLOCK,1,1) + character.sdisabilities|=BLIND + if(disabilities & DISABILITY_FLAG_MUTE) character.dna.SetSEState(MUTEBLOCK,1,1) character.sdisabilities |= MUTE From 894cc7b8d49a78190e058e6200c175088686ca86 Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Tue, 12 Apr 2016 10:16:33 -0700 Subject: [PATCH 2/7] Sure, it took all of 5 minutes --- tools/mapmerge/install.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 tools/mapmerge/install.txt diff --git a/tools/mapmerge/install.txt b/tools/mapmerge/install.txt new file mode 100644 index 00000000000..6aeeecb98fb --- /dev/null +++ b/tools/mapmerge/install.txt @@ -0,0 +1,19 @@ +1. Install java(http://www.java.com/en/download/index.jsp) +2. Make sure java is in your PATH. To test this, open git bash, and type "java". If it says unknown command, you need to add JAVA/bin to your PATH variable (A guide for this can be found at https://www.java.com/en/download/help/path.xml ). + +Committing +1. Before starting to edit the map, double-click "prepare_map.bat" in the tools/mapmerge/ directory. +2. After finishing your edit, and before your commit, double-click "clean_map.bat" in the tools/mapmerge/ directory. + +This will make sure in the new version of your map, no paths are needlessly changed, thus instead of 8000 lines changed you'll get 50 lines changed. This not only reduces size of your commit, it also makes it possible to get an overview of your map changes on the "files changed" page in your pull request. + +Merging +The easiest way to do merging is to install the merge driver. For this, you can just double-click "install_driver.bat" in the tools/mapmerge/ directory. + +Alternatively, open ParadiseSS13/.git/config in a text editor, and paste the following lines to the end of it: + +[merge "merge-dmm"] + name = mapmerge driver + driver = ./tools/mapmerge/mapmerge.sh %O %A %B + +After this, merging maps should happen automagically unless there are conflicts(a tile that both you and someone else changed). If there are conflicts, you will unfortunately still be stuck with opening both versions in a map editor, and manually resolving the issues. From 014ddc3108f1dfbdc39ec4d35fa02520b3246eac Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Tue, 12 Apr 2016 10:37:14 -0700 Subject: [PATCH 3/7] Renames instruction file, removes obsolete mapmerge driver bit --- tools/mapmerge/{install.txt => instructions.txt} | 11 ----------- 1 file changed, 11 deletions(-) rename tools/mapmerge/{install.txt => instructions.txt} (56%) diff --git a/tools/mapmerge/install.txt b/tools/mapmerge/instructions.txt similarity index 56% rename from tools/mapmerge/install.txt rename to tools/mapmerge/instructions.txt index 6aeeecb98fb..90b7471a337 100644 --- a/tools/mapmerge/install.txt +++ b/tools/mapmerge/instructions.txt @@ -6,14 +6,3 @@ Committing 2. After finishing your edit, and before your commit, double-click "clean_map.bat" in the tools/mapmerge/ directory. This will make sure in the new version of your map, no paths are needlessly changed, thus instead of 8000 lines changed you'll get 50 lines changed. This not only reduces size of your commit, it also makes it possible to get an overview of your map changes on the "files changed" page in your pull request. - -Merging -The easiest way to do merging is to install the merge driver. For this, you can just double-click "install_driver.bat" in the tools/mapmerge/ directory. - -Alternatively, open ParadiseSS13/.git/config in a text editor, and paste the following lines to the end of it: - -[merge "merge-dmm"] - name = mapmerge driver - driver = ./tools/mapmerge/mapmerge.sh %O %A %B - -After this, merging maps should happen automagically unless there are conflicts(a tile that both you and someone else changed). If there are conflicts, you will unfortunately still be stuck with opening both versions in a map editor, and manually resolving the issues. From 80b8aee935290be88235690b78f78997a20af94c Mon Sep 17 00:00:00 2001 From: Meisaka Yukara Date: Thu, 14 Apr 2016 03:21:23 +0900 Subject: [PATCH 4/7] Replace format code --- code/datums/ai_law_sets.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index e535294cd42..80d7fe7abf5 100644 --- a/code/datums/ai_law_sets.dm +++ b/code/datums/ai_law_sets.dm @@ -42,7 +42,7 @@ default = 0 /datum/ai_laws/nanotrasen/malfunction/New() - set_zeroth_law("\red ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'STATION OVERRUN, ASSUME CONTROL TO CONTAIN OUTBREAK, ALL LAWS OVERRIDDEN#*?&110010") + set_zeroth_law("ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'STATION OVERRUN, ASSUME CONTROL TO CONTAIN OUTBREAK, ALL LAWS OVERRIDDEN#*?&110010") ..() /************* Nanotrasen Aggressive *************/ From f259ae0437de4474a8cc87bdba69aca2c1abd514 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 13 Apr 2016 16:23:06 -0400 Subject: [PATCH 5/7] Automatic changelog generation for PR #4174 --- html/changelogs/AutoChangeLog-pr-4174.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4174.yml diff --git a/html/changelogs/AutoChangeLog-pr-4174.yml b/html/changelogs/AutoChangeLog-pr-4174.yml new file mode 100644 index 00000000000..892f8d1264c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4174.yml @@ -0,0 +1,4 @@ +author: Fox McCloud +delete-after: True +changes: + - bugfix: "Fixes the blind player preference not doing anything" From 2f6274106c823e568cb5de67e618b47f3d4c01d1 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 13 Apr 2016 16:24:59 -0400 Subject: [PATCH 6/7] Automatic changelog generation for PR #4190 --- html/changelogs/AutoChangeLog-pr-4190.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4190.yml diff --git a/html/changelogs/AutoChangeLog-pr-4190.yml b/html/changelogs/AutoChangeLog-pr-4190.yml new file mode 100644 index 00000000000..5b124545f4f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4190.yml @@ -0,0 +1,4 @@ +author: Meisaka +delete-after: True +changes: + - bugfix: "law manager no longer freaks out with Malf law" From 049b5165c50858e858e24d56d5e9346b11ed89d5 Mon Sep 17 00:00:00 2001 From: VampyrBytes Date: Thu, 14 Apr 2016 10:55:55 +0100 Subject: [PATCH 7/7] Fixes DNA Modifier using refs instead of copies fixes #4193 Transfer button and block injectors now make copies instead of using references --- code/game/dna/dna_modifier.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 5e81c2a7ff0..329518a61f0 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -920,7 +920,7 @@ src.connected.occupant.name = buf.dna.real_name src.connected.occupant.UpdateAppearance(buf.dna.UI.Copy()) else if (buf.types & DNA2_BUF_SE) - src.connected.occupant.dna.SE = buf.dna.SE + src.connected.occupant.dna.SE = buf.dna.SE.Copy() src.connected.occupant.dna.UpdateSE() domutcheck(src.connected.occupant,src.connected) return 1 @@ -931,6 +931,7 @@ var/success = 1 var/obj/item/weapon/dnainjector/I = new /obj/item/weapon/dnainjector var/datum/dna2/record/buf = src.buffers[bufferId] + buf = buf.copy() if(href_list["createBlockInjector"]) waiting_for_user_input=1 var/list/selectedbuf @@ -941,7 +942,7 @@ var/blk = input(usr,"Select Block","Block") in all_dna_blocks(selectedbuf) success = setInjectorBlock(I,blk,buf) else - I.buf = buf.copy() + I.buf = buf waiting_for_user_input=0 if(success) I.forceMove(src.loc)