Commit Graph

6 Commits

Author SHA1 Message Date
Cruix
f406e518cc Fixed some possible runtimes with pollCandidates() (#19919)
* Fixed some possible runtimes with pollCandidates()

* Fixed bug in pollCandidatesForMobs()
2016-08-22 08:45:22 +12:00
Jack Edge
27d6c284ed Merge branch 'fun-balloon' into shuttle-processing
Conflicts:
	_maps/shuttles/emergency_bar.dmm
	_maps/shuttles/emergency_narnar.dmm
	code/modules/spells/spell_types/wizard.dm
2016-06-25 16:26:22 +01:00
Jack Edge
ab93854786 Bug fixes, attempting to stop multiple messages 2016-06-16 00:00:55 +01:00
Jack Edge
75d4c6553a Emergency shuttle sentience balloon 2016-06-15 21:19:41 +01:00
Jack Edge
5722bbe714 Sentience balloon added 2016-06-15 21:12:39 +01:00
Jack Edge
b53b7dc0c1 Adds the fun balloon base item and sound 2016-06-15 19:03:18 +01:00