cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-8808

Browse Source
This commit is contained in:
Nadyr
2021-03-06 00:55:02 -05:00
committed by GitHub
parent cfa8b5d5c4 baf6e290d8
commit 06749f842d
278 changed files with 133211 additions and 1756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm
View File

@@ -13,9 +13,9 @@
if(M.confused)
M.Confuse(-8*removed)
if(M.eye_blurry)
M.eye_blurry = max(M.eye_blurry - 8*removed, 0)
M.eye_blurry = max(M.eye_blurry - 25*removed, 0)
if(M.jitteriness)
M.make_jittery(max(M.jitteriness - 8*removed,0))
M.make_jittery(max(M.jitteriness - 25*removed,0))
/datum/reagent/numbing_enzyme
name = "Numbing Enzyme"

2
code/modules/reagents/distilling/distilling.dm
View File

@@ -74,7 +74,7 @@
..()
/obj/machinery/portable_atmospherics/powered/reagent_distillery/Initialize()
..()
. = ..()
Reservoir = new (src)
Reservoir.Master = src

6
code/modules/reagents/hoses/connector.dm
View File

@@ -53,7 +53,7 @@
..()
/obj/item/hose_connector/Initialize()
..()
. = ..()
create_reagents(100)
@@ -105,7 +105,7 @@
..()
/obj/item/hose_connector/input/active/Initialize()
..()
. = ..()
START_PROCESSING(SSobj, src)
if(!isturf(loc))
@@ -127,7 +127,7 @@
..()
/obj/item/hose_connector/output/active/Initialize()
..()
. = ..()
START_PROCESSING(SSobj, src)
if(!isturf(loc))

2
code/modules/reagents/reagent_containers/spray.dm
View File

@@ -226,7 +226,7 @@
var/obj/item/hose_connector/input/active/InputSocket
/obj/item/weapon/reagent_containers/spray/chemsprayer/hosed/Initialize()
..()
. = ..()
InputSocket = new(src)