From 73cd1ec431b82e2aece9f6ca404a14f4bfd62542 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Fri, 9 Feb 2018 10:41:15 +0200 Subject: [PATCH 1/2] Merge pull request #35446 from 81Denton/can-synth can_synth uses TRUE/FALSE --- code/modules/reagents/chemistry/reagents.dm | 2 +- code/modules/reagents/chemistry/reagents/blob_reagents.dm | 2 +- .../reagents/chemistry/reagents/medicine_reagents.dm | 4 ++-- .../modules/reagents/chemistry/reagents/other_reagents.dm | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm index 9f8e129420..c8686d07f7 100644 --- a/code/modules/reagents/chemistry/reagents.dm +++ b/code/modules/reagents/chemistry/reagents.dm @@ -24,7 +24,7 @@ var/current_cycle = 0 var/volume = 0 var/color = "#000000" // rgb: 0, 0, 0 - var/can_synth = 1 + var/can_synth = TRUE var/metabolization_rate = REAGENTS_METABOLISM //how fast the reagent is metabolized by the mob var/overrides_metab = 0 var/overdose_threshold = 0 diff --git a/code/modules/reagents/chemistry/reagents/blob_reagents.dm b/code/modules/reagents/chemistry/reagents/blob_reagents.dm index 727ffa2874..3f81e27a83 100644 --- a/code/modules/reagents/chemistry/reagents/blob_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/blob_reagents.dm @@ -12,7 +12,7 @@ var/blobbernaut_message = "slams" //blobbernaut attack verb var/message = "The blob strikes you" //message sent to any mob hit by the blob var/message_living = null //extension to first mob sent to only living mobs i.e. silicons have no skin to be burnt - can_synth = 0 + can_synth = FALSE /datum/reagent/blob/proc/send_message(mob/living/M) var/totalmessage = message diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 923f865591..7c993c1f24 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -32,7 +32,7 @@ id = "adminordrazine" description = "It's magic. We don't have to explain it." color = "#C8A5DC" // rgb: 200, 165, 220 - can_synth = 0 + can_synth = FALSE taste_description = "badmins" /datum/reagent/medicine/adminordrazine/on_mob_life(mob/living/carbon/M) @@ -1128,7 +1128,7 @@ description = "It's mining magic. We don't have to explain it." color = "#C8A5DC" // rgb: 200, 165, 220 overdose_threshold = 3 //To prevent people stacking massive amounts of a very strong healing reagent - can_synth = 0 + can_synth = FALSE /datum/reagent/medicine/miningnanites/on_mob_life(mob/living/M) M.heal_bodypart_damage(5,5, 0) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 8a1d34ddae..d9ca4a1f62 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -619,7 +619,7 @@ id = "gluttonytoxin" description = "An advanced corruptive toxin produced by something terrible." color = "#5EFF3B" //RGB: 94, 255, 59 - can_synth = 0 + can_synth = FALSE taste_description = "decay" /datum/reagent/gluttonytoxin/reaction_mob(mob/M, method=TOUCH, reac_volume) @@ -1080,7 +1080,7 @@ id = "nanomachines" description = "Microscopic construction robots." color = "#535E66" // rgb: 83, 94, 102 - can_synth = 0 + can_synth = FALSE taste_description = "sludge" /datum/reagent/nanites/reaction_mob(mob/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0) @@ -1092,7 +1092,7 @@ id = "xenomicrobes" description = "Microbes with an entirely alien cellular structure." color = "#535E66" // rgb: 83, 94, 102 - can_synth = 0 + can_synth = FALSE taste_description = "sludge" /datum/reagent/xenomicrobes/reaction_mob(mob/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0) @@ -1658,7 +1658,7 @@ of the host body." color = "#123524" // RGB (18, 53, 36) metabolization_rate = INFINITY - can_synth = 0 + can_synth = FALSE taste_description = "brains" /datum/reagent/romerol/reaction_mob(mob/living/carbon/human/H, method=TOUCH, reac_volume)