From 5eb5b0939ac86551f40314a566cf865ce04a416b Mon Sep 17 00:00:00 2001 From: Qwertytoforty Date: Thu, 23 Jan 2020 20:39:58 -0500 Subject: [PATCH 1/9] Makes synthanol check for PROCESS_SYN instead of !M.isSynthetic --- .../reagents/chemistry/reagents/alcohol.dm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index d4d2bbe2d88..6e27b822eba 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -1190,15 +1190,17 @@ taste_description = "motor oil" /datum/reagent/consumable/ethanol/synthanol/on_mob_life(mob/living/M) - if(!M.isSynthetic()) - holder.remove_reagent(id, 3.6) //gets removed from organics very fast - if(prob(25)) - holder.remove_reagent(id, 15) - M.fakevomit() - return ..() + if(!(M.dna.species.reagent_tag & PROCESS_SYN)) + holder.remove_reagent(id, 3.6) //gets removed from organics very fast + if(prob(25)) + holder.remove_reagent(id, 15) + M.fakevomit() + + return ..() + /datum/reagent/consumable/ethanol/synthanol/reaction_mob(mob/living/M, method=TOUCH, volume) - if(M.isSynthetic()) + if(M.dna.species.reagent_tag & PROCESS_SYN) return if(method == INGEST) to_chat(M, pick("That was awful!", "Yuck!")) From 36d65344ab9f2d9376a32ab287f86d091bcb2daa Mon Sep 17 00:00:00 2001 From: Qwertytoforty Date: Thu, 23 Jan 2020 20:40:55 -0500 Subject: [PATCH 2/9] Revert "Makes synthanol check for PROCESS_SYN instead of !M.isSynthetic" This reverts commit 5eb5b0939ac86551f40314a566cf865ce04a416b. --- .../reagents/chemistry/reagents/alcohol.dm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index 6e27b822eba..d4d2bbe2d88 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -1190,17 +1190,15 @@ taste_description = "motor oil" /datum/reagent/consumable/ethanol/synthanol/on_mob_life(mob/living/M) - if(!(M.dna.species.reagent_tag & PROCESS_SYN)) - holder.remove_reagent(id, 3.6) //gets removed from organics very fast - if(prob(25)) - holder.remove_reagent(id, 15) - M.fakevomit() - - return ..() - + if(!M.isSynthetic()) + holder.remove_reagent(id, 3.6) //gets removed from organics very fast + if(prob(25)) + holder.remove_reagent(id, 15) + M.fakevomit() + return ..() /datum/reagent/consumable/ethanol/synthanol/reaction_mob(mob/living/M, method=TOUCH, volume) - if(M.dna.species.reagent_tag & PROCESS_SYN) + if(M.isSynthetic()) return if(method == INGEST) to_chat(M, pick("That was awful!", "Yuck!")) From 64f9e1da097e3deae0fa76a08ef097fc25946d51 Mon Sep 17 00:00:00 2001 From: Qwertytoforty Date: Thu, 23 Jan 2020 20:47:05 -0500 Subject: [PATCH 3/9] Revert "Revert "Makes synthanol check for PROCESS_SYN instead of !M.isSynthetic"" This reverts commit 36d65344ab9f2d9376a32ab287f86d091bcb2daa. --- .../reagents/chemistry/reagents/alcohol.dm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index d4d2bbe2d88..6e27b822eba 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -1190,15 +1190,17 @@ taste_description = "motor oil" /datum/reagent/consumable/ethanol/synthanol/on_mob_life(mob/living/M) - if(!M.isSynthetic()) - holder.remove_reagent(id, 3.6) //gets removed from organics very fast - if(prob(25)) - holder.remove_reagent(id, 15) - M.fakevomit() - return ..() + if(!(M.dna.species.reagent_tag & PROCESS_SYN)) + holder.remove_reagent(id, 3.6) //gets removed from organics very fast + if(prob(25)) + holder.remove_reagent(id, 15) + M.fakevomit() + + return ..() + /datum/reagent/consumable/ethanol/synthanol/reaction_mob(mob/living/M, method=TOUCH, volume) - if(M.isSynthetic()) + if(M.dna.species.reagent_tag & PROCESS_SYN) return if(method == INGEST) to_chat(M, pick("That was awful!", "Yuck!")) From 0bf702513cd29cd029468ebc906476dd4bccf9a7 Mon Sep 17 00:00:00 2001 From: Qwertytoforty Date: Thu, 23 Jan 2020 20:39:58 -0500 Subject: [PATCH 4/9] Makes synthanol check for PROCESS_SYN instead of !M.isSynthetic --- .../reagents/chemistry/reagents/alcohol.dm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index d4d2bbe2d88..6e27b822eba 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -1190,15 +1190,17 @@ taste_description = "motor oil" /datum/reagent/consumable/ethanol/synthanol/on_mob_life(mob/living/M) - if(!M.isSynthetic()) - holder.remove_reagent(id, 3.6) //gets removed from organics very fast - if(prob(25)) - holder.remove_reagent(id, 15) - M.fakevomit() - return ..() + if(!(M.dna.species.reagent_tag & PROCESS_SYN)) + holder.remove_reagent(id, 3.6) //gets removed from organics very fast + if(prob(25)) + holder.remove_reagent(id, 15) + M.fakevomit() + + return ..() + /datum/reagent/consumable/ethanol/synthanol/reaction_mob(mob/living/M, method=TOUCH, volume) - if(M.isSynthetic()) + if(M.dna.species.reagent_tag & PROCESS_SYN) return if(method == INGEST) to_chat(M, pick("That was awful!", "Yuck!")) From a9712c0dde1cb3cf389485f217a6c5b9e035feb0 Mon Sep 17 00:00:00 2001 From: Qwertytoforty Date: Thu, 23 Jan 2020 20:40:55 -0500 Subject: [PATCH 5/9] Revert "Makes synthanol check for PROCESS_SYN instead of !M.isSynthetic" This reverts commit 5eb5b0939ac86551f40314a566cf865ce04a416b. --- .../reagents/chemistry/reagents/alcohol.dm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index 6e27b822eba..d4d2bbe2d88 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -1190,17 +1190,15 @@ taste_description = "motor oil" /datum/reagent/consumable/ethanol/synthanol/on_mob_life(mob/living/M) - if(!(M.dna.species.reagent_tag & PROCESS_SYN)) - holder.remove_reagent(id, 3.6) //gets removed from organics very fast - if(prob(25)) - holder.remove_reagent(id, 15) - M.fakevomit() - - return ..() - + if(!M.isSynthetic()) + holder.remove_reagent(id, 3.6) //gets removed from organics very fast + if(prob(25)) + holder.remove_reagent(id, 15) + M.fakevomit() + return ..() /datum/reagent/consumable/ethanol/synthanol/reaction_mob(mob/living/M, method=TOUCH, volume) - if(M.dna.species.reagent_tag & PROCESS_SYN) + if(M.isSynthetic()) return if(method == INGEST) to_chat(M, pick("That was awful!", "Yuck!")) From 7327ead9649a1290c405153dc63280c843b85679 Mon Sep 17 00:00:00 2001 From: Qwertytoforty Date: Thu, 23 Jan 2020 20:47:05 -0500 Subject: [PATCH 6/9] Revert "Revert "Makes synthanol check for PROCESS_SYN instead of !M.isSynthetic"" This reverts commit 36d65344ab9f2d9376a32ab287f86d091bcb2daa. --- .../reagents/chemistry/reagents/alcohol.dm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index d4d2bbe2d88..6e27b822eba 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -1190,15 +1190,17 @@ taste_description = "motor oil" /datum/reagent/consumable/ethanol/synthanol/on_mob_life(mob/living/M) - if(!M.isSynthetic()) - holder.remove_reagent(id, 3.6) //gets removed from organics very fast - if(prob(25)) - holder.remove_reagent(id, 15) - M.fakevomit() - return ..() + if(!(M.dna.species.reagent_tag & PROCESS_SYN)) + holder.remove_reagent(id, 3.6) //gets removed from organics very fast + if(prob(25)) + holder.remove_reagent(id, 15) + M.fakevomit() + + return ..() + /datum/reagent/consumable/ethanol/synthanol/reaction_mob(mob/living/M, method=TOUCH, volume) - if(M.isSynthetic()) + if(M.dna.species.reagent_tag & PROCESS_SYN) return if(method == INGEST) to_chat(M, pick("That was awful!", "Yuck!")) From 7db0f17b135d2bf778bbf2ca43bd7934baa77a86 Mon Sep 17 00:00:00 2001 From: Qwertytoforty Date: Fri, 7 Feb 2020 15:13:55 -0500 Subject: [PATCH 7/9] changes spaces to tabs --- code/modules/reagents/chemistry/reagents/alcohol.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index 6e27b822eba..52931966344 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -1190,7 +1190,7 @@ taste_description = "motor oil" /datum/reagent/consumable/ethanol/synthanol/on_mob_life(mob/living/M) - if(!(M.dna.species.reagent_tag & PROCESS_SYN)) + if(!(M.dna.species.reagent_tag & PROCESS_SYN)) holder.remove_reagent(id, 3.6) //gets removed from organics very fast if(prob(25)) holder.remove_reagent(id, 15) From 7255ef3de0a92e4c1e6480b943ec48b32b2fdc47 Mon Sep 17 00:00:00 2001 From: Qwertytoforty Date: Fri, 7 Feb 2020 15:22:50 -0500 Subject: [PATCH 8/9] Fixes wrong button press --- code/modules/reagents/chemistry/reagents/alcohol.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index 398d278737c..52931966344 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -1190,11 +1190,7 @@ taste_description = "motor oil" /datum/reagent/consumable/ethanol/synthanol/on_mob_life(mob/living/M) -<<<<<<< HEAD if(!(M.dna.species.reagent_tag & PROCESS_SYN)) -======= - if(!(M.dna.species.reagent_tag & PROCESS_SYN)) ->>>>>>> 64f9e1da097e3deae0fa76a08ef097fc25946d51 holder.remove_reagent(id, 3.6) //gets removed from organics very fast if(prob(25)) holder.remove_reagent(id, 15) From c60e20db52107ac5e63cef9a29cb2326e6fabf31 Mon Sep 17 00:00:00 2001 From: Qwertytoforty Date: Fri, 7 Feb 2020 17:49:28 -0500 Subject: [PATCH 9/9] removes the last spaces and makes the code work --- code/modules/reagents/chemistry/reagents/alcohol.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index 52931966344..e8bb4a0f923 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -1191,12 +1191,12 @@ /datum/reagent/consumable/ethanol/synthanol/on_mob_life(mob/living/M) if(!(M.dna.species.reagent_tag & PROCESS_SYN)) - holder.remove_reagent(id, 3.6) //gets removed from organics very fast - if(prob(25)) - holder.remove_reagent(id, 15) - M.fakevomit() + holder.remove_reagent(id, 3.6) //gets removed from organics very fast + if(prob(25)) + holder.remove_reagent(id, 15) + M.fakevomit() - return ..() + return ..() /datum/reagent/consumable/ethanol/synthanol/reaction_mob(mob/living/M, method=TOUCH, volume)