cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 11:34:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

Browse Source 
Conflicts:
	icons/turf/areas.dmi
	maps/RandomZLevels/stationCollision.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2013-01-07 22:26:24 +10:00
parent e263f273f1 be47b96d63
commit 7efc1aafef
25 changed files with 375 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/organs/organ_external.dm
+1
View File
@@ -34,6 +34,7 @@
var/open = 0
var/stage = 0
var/list/implants = list()
// INTERNAL germs inside the organ, this is BAD if it's greater 0
var/germ_level = 0