shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Confused about bitgates.

Browse Source
This commit is contained in:
Fermi
2019-06-13 07:11:29 +01:00
parent 9fb7c9866d
commit 54985c05d9
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers.dm
+4 -4
View File
@@ -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)
. = ..()
code/modules/surgery/organs/vocal_cords.dm
+1 -1
View File
@@ -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)
tgstation.dme
+5
View File
@@ -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"