 Jordan Brown
|
4b297f509e
|
512 forward compatibility merge
|
2017-10-29 10:28:36 -05:00 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
a595bee5af
|
Update preferences.dm
|
2017-10-29 01:58:33 -05:00 |
|
|
LetterJay
|
95023664dd
|
Update preferences.dm
|
2017-10-29 01:53:35 -05:00 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
f77b66ebb9
|
Update preferences.dm
|
2017-10-29 01:40:28 -05:00 |
|
|
LetterJay
|
bea9365ea9
|
Merge branch 'master' into upstream-merge-32093
|
2017-10-29 02:27:52 -04:00 |
|
|
LetterJay
|
3b91f4efcc
|
Merge branch 'master' into upstream-merge-32096
|
2017-10-29 01:49:22 -04:00 |
|
|
LetterJay
|
debaad2948
|
Update podpeople.dm
|
2017-10-29 00:47:47 -05:00 |
|
|
LetterJay
|
d4e794eef7
|
Update furrypeople.dm
|
2017-10-29 00:47:25 -05:00 |
|
|
LetterJay
|
180e730be9
|
Update species.dm
|
2017-10-29 00:46:15 -05:00 |
|
|
LetterJay
|
78da30ec8d
|
Update species.dm
|
2017-10-29 00:25:17 -05:00 |
|
|
LetterJay
|
e150fe28b6
|
Merge branch 'master' into upstream-merge-31877
|
2017-10-28 23:57:51 -04:00 |
|
|
LetterJay
|
c64446962d
|
Merge branch 'master' into upstream-merge-32096
|
2017-10-28 03:47:08 -04:00 |
|
|
LetterJay
|
6172cd38bd
|
Merge pull request #3628 from Citadel-Station-13/upstream-merge-32087
[MIRROR] Halloween Tweaks
|
2017-10-28 03:16:43 -04:00 |
|
|
LetterJay
|
0e553b26db
|
Merge branch 'master' into upstream-merge-31737
|
2017-10-28 02:20:25 -04:00 |
|
|
LetterJay
|
79d6f42dfd
|
conflicts
|
2017-10-28 01:16:26 -05:00 |
|
|
LetterJay
|
5dbcbf5689
|
Update podpeople.dm
|
2017-10-28 00:23:30 -05:00 |
|
|
LetterJay
|
12fa1e3ece
|
Update preferences_savefile.dm
|
2017-10-27 23:54:51 -05:00 |
|
|
Jordan Brown
|
82c388b3e8
|
Makes thermite a component
|
2017-10-27 17:36:38 -05:00 |
|
|
oranges
|
c00c1dcc00
|
Merge pull request #32127 from tgstation/Cyberboss-patch-3
[s] Blocks world proc calls
|
2017-10-27 17:35:20 -05:00 |
|
|
Jordan Brown
|
fde6a94202
|
Merge pull request #32112 from KorPhaeron/mummies
"Mummies" (cloth golems) for Halloween
|
2017-10-27 17:33:52 -05:00 |
|
|
Jordan Brown
|
1d8184e206
|
Merge pull request #32142 from optimumtact/boiwhatarethose
Remove stray parent proc call in collector code
|
2017-10-27 17:31:19 -05:00 |
|
|
Anonmare
|
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 |
|
|
Jordan Brown
|
8c194d8947
|
Merge pull request #32137 from MrStonedOne/patch-441
Remove some unneeded null checks in lighting
|
2017-10-27 17:28:52 -05:00 |
|
|
LetterJay
|
fb5863ba35
|
Merge pull request #3630 from deathride58/adminhelphandlebutton
Adds a "Handle Issue" button to ahelps
|
2017-10-27 16:33:21 -04:00 |
|
|
LetterJay
|
39f683ab8d
|
Update meteor_wave.dm
|
2017-10-27 15:32:38 -05:00 |
|
|
LetterJay
|
12d336cbf0
|
Update halloween.dm
|
2017-10-27 15:32:15 -05:00 |
|
|
JamieH
|
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 |
|
|
Emmett Gaines
|
ea36d5944e
|
More radiation balance changes and fixes (#32051)
* more balance changes and fixes
* cleanup
|
2017-10-27 03:08:03 -05:00 |
|
|
LetterJay
|
9599dd94c0
|
Merge pull request #3634 from deathride58/voreproctovoreverb
Readds the hook necessary for vore setup
|
2017-10-27 03:15:22 -04:00 |
|
|
LetterJay
|
7f6b1a6400
|
Merge pull request #3637 from deathride58/loocerrorfix
Fixes LOOC error messages not appearing in goonchat
|
2017-10-27 02:48:16 -04:00 |
|
|
LetterJay
|
141de52658
|
Merge pull request #3641 from Citadel-Station-13/upstream-merge-30791
[MIRROR] Assmos part 1, #2
|
2017-10-27 02:47:56 -04:00 |
|
|
LetterJay
|
4ab8e0d8f1
|
Merge pull request #3625 from Citadel-Station-13/upstream-merge-31987
[MIRROR] Inlines and optimizes compile_overlays
|
2017-10-27 02:44:48 -04:00 |
|
|
LetterJay
|
9a1db237d2
|
Merge pull request #3618 from Citadel-Station-13/upstream-merge-32058
[MIRROR] Fixes lightgeist spawning
|
2017-10-27 02:18:48 -04:00 |
|
|
LetterJay
|
3202baec26
|
Merge pull request #3615 from Citadel-Station-13/upstream-merge-32075
[MIRROR] Makes staff of change randomly assign a borg module
|
2017-10-27 02:17:45 -04:00 |
|
|
LetterJay
|
4fee09e236
|
Merge pull request #3613 from Citadel-Station-13/upstream-merge-32098
[MIRROR] Fixes a runtime on organ replacement
|
2017-10-27 02:16:47 -04:00 |
|
|
LetterJay
|
6b0bb7268e
|
Merge pull request #3611 from Citadel-Station-13/upstream-merge-31945
[MIRROR] Adds ambience to the SM and portable generators
|
2017-10-27 02:16:02 -04:00 |
|
|
LetterJay
|
49fa09d1bd
|
Merge pull request #3578 from Citadel-Station-13/upstream-merge-31944
[MIRROR] Atmos construction rework again
|
2017-10-27 02:00:11 -04:00 |
|
|
LetterJay
|
4facc9c04e
|
Update pump.dm
|
2017-10-27 00:23:13 -05:00 |
|
|
LetterJay
|
2b699d8d73
|
Update volume_pump.dm
|
2017-10-27 00:05:28 -05:00 |
|
|
as334
|
eb4f6326d7
|
Assmos part 1, #2
|
2017-10-26 23:12:27 -05:00 |
|