Commit Graph

40933 Commits

Author SHA1 Message Date
Jordan Brown 55719b3ea3 Merge pull request #29493 2017-07-26 16:43:07 -04:00
Jordan Brown 58fdff5b97 Merge pull request #29488 2017-07-26 16:43:02 -04:00
Jordan Brown 0b6376f449 Merge pull request #29487 2017-07-26 16:42:59 -04:00
Jordan Brown df84161073 Merge pull request #29464 2017-07-26 16:42:55 -04:00
BeeSting12 ef251fc3a7 might be better to use total worth instead 2017-07-26 14:37:48 -04:00
BeeSting12 0fb80e97b3 fixes a couple issues 2017-07-26 14:38:44 -04:00
shizcalev 27c1c0347d Last ones.
Missed a couple. Also cleaned up a couple leftover semicolons
2017-07-26 12:47:38 -04:00
shizcalev 863ff3f826 Corrected comment. 2017-07-26 12:27:38 -04:00
shizcalev 12c279e537 less vague paths, inconsistency with derelict path 2017-07-26 12:25:39 -04:00
Joan Lung cbfdc9ca3c cease cleverness 2017-07-26 11:43:28 -04:00
kevinz000 8dd52c80d2 Update SDQL_2.dm 2017-07-26 06:53:47 -07:00
kevinz000 d0d351f0b0 SDQL_runtimes 2017-07-26 05:57:16 -07:00
shizcalev ab183d2e1d fixed compile 2017-07-26 05:48:07 -04:00
shizcalev 8ebf6b6a43 cleaned up paper 2017-07-26 05:35:05 -04:00
oranges cfab0aba99 Removes the dangerrating variable, which is completely unused 2017-07-26 08:34:58 +00:00
BeeSting12 f4329f4ebe i really hope this will fix it 2017-07-26 00:40:14 -04:00
shizcalev 0559af385f mining closets 2017-07-25 23:28:10 -04:00
shizcalev 065bda1cc2 things 2017-07-25 22:26:51 -04:00
Joan Lung 6d7e3f2281 Lava is no longer a plating subtype (#29463) 2017-07-25 22:16:02 -03:00
Jordan Brown 2f0c114c2e Fixes global init linux bug by using proc typepath references, adds better error detection (#29373) 2017-07-25 21:41:53 -03:00
Anonmare 701436878b Makes chemical payload bomb cores less misleading 2017-07-26 01:21:47 +01:00
pigeons 4e05dd63f9 Fixes timer id collision (#29437)
The list of active timers timer_id_dict identifies timers by their numerical id as a string. However this was done using embedded expressions inside the string, which calls num2text with a default of 6 significant figures. This means anything at or above 1 million is expressed in scientific notation.

"timer[1000000]" -> "timer1e+06"
"timer[1000001]" -> "timer1e+06"

Calling num2text manually with 8 significant figures kicks the collision problem down the road to 2^24 (16 million).

nextid is now selectively incremented and is looped back to 1 when reaching the 2^24 threshold.
Also now includes collision checking.
2017-07-26 11:48:21 +12:00
Tacolizard 7a64ded7a2 Adds cybernetic organs (#29276)
add: Added cybernetic organs to RnD, they can be used to replace organic organs. Remember to administer corazone during implantation though!
add: Added the upgraded cybernetic liver. It is exceptionally robust against toxins and alcohol poisoning.
2017-07-26 11:29:28 +12:00
oranges b44bb6ffad Revert "Adds the hivebot invasion event (#28514)"
This reverts commit 78a2e5c4c3.
2017-07-25 23:06:38 +00:00
oranges 1ff034b0af Revert "Fixes hivebot swarm core not clearing it's target"
This reverts commit 00870ee32e.
2017-07-25 23:06:29 +00:00
Joan Lung 6bcf83ca5b Portals do not go on supply shuttles 2017-07-25 16:28:25 -04:00
Jordan Brown 644f436df8 Merge pull request #29460 2017-07-25 16:21:39 -04:00
Jordan Brown 3d408a54ec Merge pull request #29450 2017-07-25 16:21:03 -04:00
Jordan Brown d025068eae Merge pull request #29467 2017-07-25 16:20:24 -04:00
Jordan Brown 26f16d2222 Merge pull request #29476 2017-07-25 16:19:41 -04:00
Jordan Brown 2819c7fcd0 Merge pull request #29477 2017-07-25 16:18:58 -04:00
BeeSting12 f5f8f7f369 gives service borgs one too 2017-07-25 13:11:11 -04:00
Xhuis 35c396be90 Fixes some zooming weirdness 2017-07-25 11:27:13 -04:00
AnturK 9380c503d8 Adds logging of shuttle request reasons. (#29457) 2017-07-25 11:53:15 -03:00
Fox-McCloud c801be6894 defines and cleanup 2017-07-25 09:36:36 -04:00
kevinz000 75d9f8e3fc Update musician.dm 2017-07-25 04:44:56 -07:00
Jordie0608 7e6ed58148 change versioning check to use insert 2017-07-25 17:56:48 +10:00
Leo 9aa7da8844 Merge pull request #29423 from kevinz000/patch-264
makes gulag beacon indestructible
2017-07-24 23:58:08 -03:00
Leo 2550dff44b Merge pull request #29462 from XDTM/BetterFix
Fixes virology timing in a better way
2017-07-24 23:57:48 -03:00
KorPhaeron 69690c1826 Small 2017-07-24 22:17:09 -04:00
ShizCalev 0e9b3967e2 Spellchecks the map definitions (#29485) 2017-07-25 14:16:06 +12:00
KorPhaeron 6305192b63 Makes narsie less huge 2017-07-24 22:01:28 -04:00
BeeSting12 a97d4e87f8 vwejiwcqcwvwfbv 2017-07-24 19:11:49 -04:00
Ashe Higgs 08569ecadb You can now control-click action buttons to lock them in place (#29379)
Adds a lock function to action buttons, as well as a preference controlling default behaviour.
2017-07-25 10:05:18 +12:00
Joan Lung 60e6580495 things I thought I fixed 2017-07-24 17:46:06 -04:00
Jordan Brown 0321e6bd85 DCS Continued (#29324)
Adds's documentation to the DCS system, refactors to improve the caller API
2017-07-25 09:44:19 +12:00
Joan Lung 3781289eb7 it's stronger 2017-07-24 17:35:09 -04:00
oranges ab940008b8 Merge pull request #29454 from ShizCalev/nanotrasen
Standardized the corporate name
2017-07-25 09:34:20 +12:00
Joan Lung a2572d5845 little bit of cheating so this doesn't super suck/get exploited 2017-07-24 17:27:43 -04:00
Joan Lung 5b48b94c6f Reworks Clockcult's standard conversion method, removes Taunting Tirade 2017-07-24 17:16:08 -04:00