From 54985c05d9cd0277e1f0a864005cfbd28e0e65b5 Mon Sep 17 00:00:00 2001 From: Fermi Date: Thu, 13 Jun 2019 07:11:29 +0100 Subject: [PATCH] Confused about bitgates. --- code/modules/reagents/reagent_containers.dm | 8 ++++---- code/modules/surgery/organs/vocal_cords.dm | 2 +- tgstation.dme | 5 +++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 45cf95dacb..c84d7fec8a 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -1,6 +1,6 @@ -#define FLAG_STATUS_NONE (1<<0) -#define FLAG_STATUS_PH_IMMUNE (1<<1) -#define FLAG_STATUS_TEMP_IMMUNE (1<<2) +#define FLAG_STATUS_NONE 0b00 +#define FLAG_STATUS_PH_IMMUNE 0b01 +#define FLAG_STATUS_TEMP_IMMUNE 0b10 /obj/item/reagent_containers @@ -16,7 +16,7 @@ var/spawned_disease = null var/disease_amount = 20 var/spillable = FALSE - var/beaker_resistances |= (1<<3) + var/beaker_resistances = 0b11 /obj/item/reagent_containers/Initialize(mapload, vol) . = ..() diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index 4dd6dd374d..d5f8700f6c 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -622,7 +622,7 @@ var/base_multiplier = 1 //spans = list("say","yell") -/obj/item/organ/vocal_cords/proc/handle_speech(message) //actually say the message +/obj/item/organ/vocal_cords/velvet/handle_speech(message) //actually say the message owner.say(message, spans = spans, sanitize = FALSE) velvetspeech(message, owner) diff --git a/tgstation.dme b/tgstation.dme index bfbb2a7052..00d3bcbed8 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -3008,8 +3008,13 @@ #include "modular_citadel\code\modules\projectiles\guns\energy\laser.dm" #include "modular_citadel\code\modules\projectiles\projectile\energy.dm" #include "modular_citadel\code\modules\projectiles\projectiles\reusable.dm" +#include "modular_citadel\code\modules\reagents\chemistry\reagents\astrogen.dm" +#include "modular_citadel\code\modules\reagents\chemistry\reagents\eigentstasium.dm" +#include "modular_citadel\code\modules\reagents\chemistry\reagents\enlargement.dm" #include "modular_citadel\code\modules\reagents\chemistry\reagents\fermi_reagents.dm" +#include "modular_citadel\code\modules\reagents\chemistry\reagents\MKUltra.dm" #include "modular_citadel\code\modules\reagents\chemistry\reagents\other_reagents.dm" +#include "modular_citadel\code\modules\reagents\chemistry\reagents\SDGF.dm" #include "modular_citadel\code\modules\reagents\chemistry\recipes\fermi.dm" #include "modular_citadel\code\modules\reagents\objects\fermiclothes.dm" #include "modular_citadel\code\modules\reagents\objects\items.dm"