715a2fb918
Merge pull request #3677 from Citadel-Station-13/upstream-merge-32080
...
[MIRROR] Ice Spiders now use frost oil instead of toxin
2017-10-29 23:37:58 -04:00
2715fa9953
Merge pull request #3679 from Citadel-Station-13/upstream-merge-32174
...
[MIRROR] Halloween race fixes
2017-10-29 16:05:19 -04:00
66245d9451
Merge pull request #3674 from Citadel-Station-13/upstream-merge-32154
...
[MIRROR] Events take pre-game lobby time into account
2017-10-29 15:52:13 -04:00
c5565dff94
Merge pull request #3669 from Citadel-Station-13/upstream-merge-32168
...
[MIRROR] One more thing to allow more mobs to qdel nicely
2017-10-29 15:50:44 -04:00
254ffca3b7
Merge pull request #3668 from Citadel-Station-13/upstream-merge-32162
...
[MIRROR] Actually fixes meteors, again
2017-10-29 15:49:40 -04:00
47cfffbb26
Merge pull request #3648 from Citadel-Station-13/upstream-merge-32116
...
[MIRROR] Line by line profiling system
2017-10-29 15:48:47 -04:00
edfc86c895
Halloween race fixes
2017-10-29 12:31:38 -05:00
9c63e30e2f
Ice Spiders now use frost oil instead of toxin ( #32080 )
...
* PARASTENG!!
* just monika
2017-10-29 11:02:50 -05:00
8d234df96f
Events take pre-game lobby time into account ( #32154 )
...
* Events take pre-game lobby time into account
* Friends don't let friends code without coffee.
It would appear that I have no friends
* i blame cyberboss
2017-10-29 10:36:56 -05:00
53c9c16fe3
one more thing to allow more mobs to qdel nicely ( #32168 )
2017-10-29 07:14:44 -05:00
d6d01ab630
Actually fixes meteors, again ( #32162 )
...
* Actually fixes meteors, again
* unrelated typo fix for an admin debug verb
2017-10-29 07:13:31 -05:00
f900f2ea9a
Merge pull request #3660 from Citadel-Station-13/upstream-merge-31864
...
[MIRROR] Makes thermite a component
2017-10-29 04:23:16 -04:00
077e2a1598
Merge pull request #3655 from Citadel-Station-13/upstream-merge-32112
...
[MIRROR] "Mummies" (cloth golems) for Halloween
2017-10-29 04:20:28 -04:00
2503a90dc0
Merge pull request #3585 from Michiyamenotehifunana/CX-sword
...
Adds fancy Energy Swords (and a toy version)
2017-10-29 03:56:27 -04:00
41eb83fb3d
Merge pull request #3658 from Citadel-Station-13/upstream-merge-32127
...
[MIRROR] [s] Blocks world proc calls
2017-10-29 03:47:43 -04:00
fb24abfaf7
Merge pull request #3652 from Citadel-Station-13/upstream-merge-32142
...
[MIRROR] Remove stray parent proc call in collector code
2017-10-29 03:46:30 -04:00
13891ec34b
Merge pull request #3651 from Citadel-Station-13/upstream-merge-32107
...
[MIRROR] Adds some new grindables to the grinder
2017-10-29 03:46:19 -04:00
7402fab19e
Merge pull request #3650 from Citadel-Station-13/upstream-merge-32137
...
[MIRROR] Remove some unneeded null checks in lighting
2017-10-29 03:46:05 -04:00
4b300cee6c
Merge branch 'master' into upstream-merge-32116
2017-10-29 03:45:59 -04:00
5f9a76c6dd
Merge pull request #3644 from Citadel-Station-13/upstream-merge-32009
...
[MIRROR] Add a safety check to buildmode, also fix a bug with corner selection
2017-10-29 03:45:06 -04:00
c62f6ec353
Merge pull request #3632 from Citadel-Station-13/upstream-merge-32093
...
[MIRROR] Roundstart species pref fixes/removes redundant species config
2017-10-29 03:41:59 -04:00
a595bee5af
Update preferences.dm
2017-10-29 01:58:33 -05:00
95023664dd
Update preferences.dm
2017-10-29 01:53:35 -05:00
74a33169cb
Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051
...
[MIRROR] More radiation balance changes and fixes
2017-10-29 02:41:44 -04:00
f77b66ebb9
Update preferences.dm
2017-10-29 01:40:28 -05:00
bea9365ea9
Merge branch 'master' into upstream-merge-32093
2017-10-29 02:27:52 -04:00
3b91f4efcc
Merge branch 'master' into upstream-merge-32096
2017-10-29 01:49:22 -04:00
debaad2948
Update podpeople.dm
2017-10-29 00:47:47 -05:00
d4e794eef7
Update furrypeople.dm
2017-10-29 00:47:25 -05:00
180e730be9
Update species.dm
2017-10-29 00:46:15 -05:00
78da30ec8d
Update species.dm
2017-10-29 00:25:17 -05:00
e150fe28b6
Merge branch 'master' into upstream-merge-31877
2017-10-28 23:57:51 -04:00
c64446962d
Merge branch 'master' into upstream-merge-32096
2017-10-28 03:47:08 -04:00
6172cd38bd
Merge pull request #3628 from Citadel-Station-13/upstream-merge-32087
...
[MIRROR] Halloween Tweaks
2017-10-28 03:16:43 -04:00
0e553b26db
Merge branch 'master' into upstream-merge-31737
2017-10-28 02:20:25 -04:00
79d6f42dfd
conflicts
2017-10-28 01:16:26 -05:00
5dbcbf5689
Update podpeople.dm
2017-10-28 00:23:30 -05:00
12fa1e3ece
Update preferences_savefile.dm
2017-10-27 23:54:51 -05:00
82c388b3e8
Makes thermite a component
2017-10-27 17:36:38 -05:00
c00c1dcc00
Merge pull request #32127 from tgstation/Cyberboss-patch-3
...
[s] Blocks world proc calls
2017-10-27 17:35:20 -05:00
fde6a94202
Merge pull request #32112 from KorPhaeron/mummies
...
"Mummies" (cloth golems) for Halloween
2017-10-27 17:33:52 -05:00
1d8184e206
Merge pull request #32142 from optimumtact/boiwhatarethose
...
Remove stray parent proc call in collector code
2017-10-27 17:31:19 -05:00
79e69cbd36
Adds some new grindables to the grinder ( #32107 )
...
* Adds some new grindables to the grinder
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Adds the extra ")"
* Update reagentgrinder.dm
2017-10-27 17:30:08 -05:00
8c194d8947
Merge pull request #32137 from MrStonedOne/patch-441
...
Remove some unneeded null checks in lighting
2017-10-27 17:28:52 -05:00
fb5863ba35
Merge pull request #3630 from deathride58/adminhelphandlebutton
...
Adds a "Handle Issue" button to ahelps
2017-10-27 16:33:21 -04:00
39f683ab8d
Update meteor_wave.dm
2017-10-27 15:32:38 -05:00
12d336cbf0
Update halloween.dm
2017-10-27 15:32:15 -05:00
f36d3ff08a
Line by line profiling system
2017-10-27 13:10:21 -05:00
7811507f1a
Add a safety check to buildmode, also fix a bug with corner selection ( #32009 )
...
* Update buildmode.dm
* Add files via upload
* Update buildmode.dm
* Update buildmode.dm
2017-10-27 04:51:58 -05:00
ea36d5944e
More radiation balance changes and fixes ( #32051 )
...
* more balance changes and fixes
* cleanup
2017-10-27 03:08:03 -05:00
LetterJay