Commit Graph

1352 Commits

Author SHA1 Message Date
Cyberboss
78ee754da3 Merge upstream 2017-04-01 23:38:37 -04:00
Cyberboss
db2d9c6e5d Map splash transition will no longer be blank (#25671) 2017-04-01 19:39:32 -03:00
AnturK
e6803e64a2 Merge pull request #25580 from coiax/landmarks-refactor
Landmarks refactor, part 1
2017-04-01 13:26:03 +02:00
XDTM
b56d2b4db3 Fixes facehuggers ripping masks off protected mobs (#25488)
* Fixes facehuggers ripping masks off protected mobs

* it didn't give an error on my end but oh well

* i did it
2017-04-01 12:57:47 +13:00
Cyberboss
e3c31d2fa7 Roundstart Events. Fixes xeno egg announcement timer (#25659)
* Add support for roundstart events

* Fixes #25649
2017-03-31 20:20:40 +02:00
Remie Richards
d1b2be75ad Fixes #24998 (Statues spawned by wizards are invisible) - Correctly (#25638)
* Fixes #24998 Correctly

* Fixes potential addition to non initialised overlays list
2017-03-31 09:33:44 -03:00
Cyberboss
5646c736c8 Merge upstream 2017-03-30 19:18:59 -04:00
kevinz000
d17aacc8cd Allows soft-disabling of flightsuit processing, moves subsystem defines to subsystems.dm (#25513) 2017-03-30 09:07:49 -03:00
Cyberboss
a8eefff531 Active turf visualization (#25594) 2017-03-30 08:39:10 -03:00
Cyberboss
ef5ac7dcc7 Adds feedback for the map a round was played on (#25593) 2017-03-30 08:37:02 -03:00
Cyberboss
ee0a2f7e36 Fixes spawned atoms not late initializing (#25575) 2017-03-29 19:16:13 -03:00
Jack Edge
2947b6679d Converts Centcom 2017-03-29 18:08:30 +01:00
Cyberboss
2fd142959a Merge upstream 2017-03-28 18:52:59 -04:00
Cyberboss
7ad4aa7a19 Improve SStitle. No delay icon loading (#25541) 2017-03-28 15:40:37 -03:00
Jack Edge
fc89cc9c33 Removes unused monkeystart landmark type 2017-03-28 19:20:47 +01:00
Cyberboss
05e1ef69e1 Merge upstream 2017-03-27 09:32:08 -04:00
MrPerson
aed556923d Fixes hyperspace being black (#25507)
Fixes #25272
2017-03-27 00:12:38 -03:00
Cyberboss
7b9fd7e6fb SNPC Refactor (#25429)
* Move the interactive file to the right spot

* Proper scheduling

* dOY

* Fix shit
2017-03-26 21:24:38 +02:00
Cyberboss
85d5896892 Fuck everything 2017-03-24 18:21:17 -04:00
Cyberboss
cd050a38f0 Merge branch 'master' of https://github.com/tgstation/tgstation into TiredOfTheInconsistency 2017-03-24 16:34:20 -04:00
Cyberboss
db99403313 Merge branch 'master' into TiredOfTheInconsistency 2017-03-23 09:21:20 -04:00
Jack Edge
4e8badad73 Fixes some runtimes with soapstone messages
I'm not sure why they're not loading on main anymore, possibly some bad
JSON data? This stopped the warning locally, anyway.
2017-03-22 20:06:09 +00:00
Cyberboss
fb596bcdb3 _DEF 2017-03-22 14:52:21 -04:00
Cyberboss
6a67a84c33 Missed that 2017-03-22 12:34:38 -04:00
Cyberboss
a801187ede Fix shit 2017-03-22 12:11:59 -04:00
Cyberboss
7e14ec75fc Normalizes subsystem definitions 2017-03-22 11:50:46 -04:00
Cyberboss
b1e4681c23 SSnpc -> SSnpcpool 2017-03-22 11:42:48 -04:00
Cyberboss
089e145ce6 SSmob -> SSmobs 2017-03-22 11:41:52 -04:00
Cyberboss
71deca2374 SSmachine -> SSmachines 2017-03-22 11:38:35 -04:00
Cyberboss
5907da67ee Rename files where appropriate 2017-03-22 11:33:12 -04:00
Cyberboss
b0e2c75b07 garbage_collector -> garbage 2017-03-22 11:27:49 -04:00
Cyberboss
73fa1e61f8 SSevent -> SSevents 2017-03-22 11:26:01 -04:00
Cyberboss
e86a353f00 Rename SSasset to SSassets 2017-03-22 11:23:15 -04:00
Cyberboss
326cc65f3f Fix the type declaration 2017-03-22 11:03:27 -04:00
Cyberboss
8d51261ecc Fix the master var rename 2017-03-22 10:52:11 -04:00
Cyberboss
d0bfbc3e13 Rename ticker to SSticker 2017-03-22 10:48:25 -04:00
Cyberboss
28547e6b6b Fix new qdeletion spam (#25344) 2017-03-22 11:27:17 -03:00
kevinz000
51d3cd11f5 [READY]Refactors beams to use timers for recalculation, and new beam proc after drawing (#25252)
* now with timers!

* woops

* hmm this is better

* stoppable timers

* more timer stuff

* fix

* fix
2017-03-22 22:19:16 +13:00
Cyberboss
8023a02e57 Map loader optimizations (#25316)
* Cut out an unecessary locate call

* Remove an unecessary var

* Add an appropriate warning

* Move the CHECK_TICK to a more sensible place

* Change the default turf to /turf/open/space/basic

* Skip loading default turfs

* No need for CreateSpace anymore

* Improve the comment
2017-03-22 22:10:00 +13:00
Cyberboss
90ada23ae1 Fixes SSlighting locking up (#25276)
* Fix the ticklimit bug
2017-03-20 11:01:08 -03:00
Cyberboss
3889d0372d Fix event cancellation (#25200)
* Fix event cancellation

* CANT
2017-03-18 18:15:10 +01:00
Leo
d13c00f17b Merge pull request #25148 from Cyberboss/patch-35
Makes SSlighting fully initialize
2017-03-17 22:02:40 -03:00
Cheridan
6a515563f6 Merge pull request #25143 from Cyberboss/ControllerRestart
Fixes some badness with controller restarting
2017-03-17 15:12:34 -05:00
Cyberboss
3c9b0b152b Refactors statclick a bit (#25102) 2017-03-17 13:29:25 -03:00
Cyberboss
0bb7407503 Adds a configuration option for disabling preferred maps (#25137)
* Adds a config option to disable map voting
2017-03-17 12:50:26 -03:00
Joan Lung
58216c4189 Merge pull request #25192 from MrPerson/no_more_reverts_this_pull_request_has_a_family
Fixes non-dynamically lit areas being pitch black
2017-03-17 11:07:15 -04:00
MrPerson
b71e89ce10 Fixes non-dynamically lit areas being pitch black
Fixes #25179 (Legitimate closing of a pull request, thanks for this bug github)
Fixes #25164
2017-03-16 21:30:06 -07:00
Cyberboss
c09d61ae79 Runtime station fixes (#25151)
* Fixes spawning on runtimestation titlescreen

* Fix shuttle runtimes
2017-03-17 00:07:34 -03:00
oranges
8848d46b0c Merge pull request #25141 from MrStonedOne/patch-332
Remove low priority from lighting
2017-03-17 15:42:20 +13:00
Cyberboss
b639f0c99e Fixes admin latejoin disabling (#25041)
* Fixes admin latejoin disabling

* Fix alerts
2017-03-16 17:06:52 -04:00