Proper mirror PR for the disease refactor because I fucked up the first one. (#2026)

* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"

This reverts commit 44742cb115.

* Delete shuttle_loan.dm.rej

* Delete life.dm.rej

* Update life.dm

* Delete life.dm.rej

* compile
This commit is contained in:
kevinz000
2017-07-31 23:41:22 -07:00
committed by GitHub
parent 277b7e6f80
commit bbcad2fa58
55 changed files with 246 additions and 322 deletions
+1 -1
View File
@@ -113,7 +113,7 @@
//List of active diseases
var/list/viruses = list() // replaces var/datum/disease/virus
var/list/viruses = list() // list of all diseases in a mob
var/list/resistances = list()
mouse_drag_pointer = MOUSE_ACTIVE_POINTER