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

re-renable things, now that things aren't exploding

Browse Source
This commit is contained in:
Tastyfish
2012-02-13 01:01:33 -05:00
parent 0dc9bc325b
commit 47ec6a7021
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/FEA/FEA_system.dm
View File

@@ -329,8 +329,9 @@ datum
AG.process_group()
process_singletons()
//for(var/turf/simulated/T in active_singletons) // this code shouldn't actually exist in the current version of FEA apparently,
// T.process_cell() // causes horrible gas variable glitching
for(var/item in active_singletons)
if(!istype(item, /turf/space))
item:process_cell()
process_super_conductivity()
for(var/turf/simulated/hot_potato in active_super_conductivity)

2
code/game/events/EventsMain.dm
View File

@@ -6,7 +6,7 @@
*/
var/list/DisallowedEvents = list(/datum/event/spaceninja, /datum/event/prisonbreak, /datum/event/immovablerod, /datum/event/gravitationalanomaly, /datum/event/alieninfestation, /datum/event/meteorstorm)
var/list/DisallowedEvents = list(/datum/event/spaceninja, /datum/event/prisonbreak, /datum/event/immovablerod, /datum/event/gravitationalanomaly, /datum/event/alieninfestation)
var/list/EventTypes = typesof(/datum/event) - /datum/event - DisallowedEvents
var/list/OneTimeEvents = list(/datum/event/spacecarp, /datum/event/miniblob)
var/datum/event/ActiveEvent = null