Commit Graph

20 Commits

Author SHA1 Message Date
KorPhaeron
f1374d1730 Merge branch 'master' into theworstshuttle 2017-02-10 11:27:34 -06:00
coiax
380334259e Luxury shuttle changes (#23903)
🆑 coiax
add: The Luxury Shuttle grabs cash in your wallet and backpack, and
shares approval between the entrance gates.
/🆑

- Luxury Shuttle grabbing cash in your wallet is self explanatory,
although we lack a "proper" cash spending system on /tg/.
2017-02-10 10:03:39 -06:00
KorPhaeron
c7bd42a278 Fixes the lighting situation in the shuttle 2017-02-09 10:25:51 -06:00
KorPhaeron
781588566b Fixes 2017-02-06 20:28:37 -06:00
KorPhaeron
a2c9af8abf Arena Shuttle 2017-02-06 14:54:58 -06:00
Cyberboss
b86e224571 Makes qdeleted and qdestroying macros (#23666)
* Makes qdeleted and qdestroying macros

* Makes QDELETED and QDESTROYING uppercase

* Swap qdel checks istype's for != null's

* Fix it

* How was this missed?
2017-02-06 00:59:27 +13:00
Kyle Spier-Swenson
12570805bd Closes the Pool. (#23150)
* Delete pool.dm

* Removes usage of PoolOrNew

* Wrap up
2017-01-22 16:00:23 -05:00
Joan Lung
b0f3a27261 Changes a few things into temporary visual effects 2017-01-06 16:45:36 -05:00
KorPhaeron
b3baa8314c Build your own shuttle 2016-11-19 15:28:25 -06:00
KorPhaeron
5d5b88e8f9 Stop counting extra money 2016-11-15 14:19:18 -06:00
KorPhaeron
fb6bc16dfb Removes extra definition, no longer consumes excess money 2016-11-14 13:19:17 -06:00
KorPhaeron
6d8e8b2532 Properly counts stacked cash 2016-11-13 22:47:16 -06:00
KorPhaeron
3221c630c5 Adds the luxury shuttle, adds descriptions to other shuttles 2016-11-13 22:31:28 -06:00
KorPhaeron
a51804f6af Crashing this station 2016-11-13 15:16:33 -06:00
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