2ec7958a87
Merge pull request #3118 from Citadel-Station-13/upstream-merge-31260
...
[MIRROR] Adds missing abductor metal sheet sprites
2017-10-04 12:28:41 -04:00
c08ff0dead
Merge pull request #3116 from Citadel-Station-13/upstream-merge-31261
...
[MIRROR] Fixes species locked slots alpha.
2017-10-04 12:28:25 -04:00
67bf519df5
Automatic changelog generation for PR #3115 [ci skip]
2017-10-04 11:28:16 -05:00
d8d75099e5
Merge pull request #3115 from Citadel-Station-13/upstream-merge-31241
...
[MIRROR] Makes gutlunches hungry for gibs again
2017-10-04 12:28:14 -04:00
4959746caf
Merge pull request #3113 from Citadel-Station-13/upstream-merge-31237
...
[MIRROR] Server tools API update to 3.1.0.1
2017-10-04 12:27:53 -04:00
63d9d2facb
Adds missing abductor metal sheet sprites
2017-10-04 06:15:07 -05:00
5b8eb58266
Merge pull request #31260 from ShizCalev/alium-sheets
...
Adds missing abductor metal sheet sprites
2017-10-04 06:15:07 -05:00
90bd29cba5
Fixes species locked slots alpha.
2017-10-04 06:12:46 -05:00
951c9d04f2
Merge pull request #31261 from AnturK/lockedslot
...
Fixes species locked slots alpha.
2017-10-04 06:12:46 -05:00
85e74900cb
Makes gutlunches hungry for gibs again
2017-10-04 04:11:33 -05:00
cdc7695741
Makes gutlunches hungry for gibs again ( #31241 )
...
* gutlunch fix
* combine ifs, removes unneeded check
2017-10-04 04:11:33 -05:00
daa5bc6128
Automatic changelog generation for PR #3110 [ci skip]
2017-10-04 01:14:23 -05:00
0515d2b754
Merge pull request #3110 from Citadel-Station-13/upstream-merge-31034
...
[MIRROR] Nightmare organs
2017-10-04 02:14:22 -04:00
07e407a02f
Automatic changelog generation for PR #3108 [ci skip]
2017-10-04 01:14:09 -05:00
719b433ede
Merge pull request #3108 from Citadel-Station-13/upstream-merge-31179
...
[MIRROR] Adds the advanced medical scanner, gives one to the CMO
2017-10-04 02:14:07 -04:00
3a5e3bc530
Automatic changelog generation for PR #3104 [ci skip]
2017-10-04 01:13:37 -05:00
05d9c9d3a2
Merge pull request #3104 from Citadel-Station-13/upstream-merge-31181
...
[MIRROR] Blobs now take damage from particle accelerators
2017-10-04 02:13:35 -04:00
f8f278dfd5
Automatic changelog generation for PR #3093 [ci skip]
2017-10-03 19:16:12 -05:00
0830e6907e
Merge pull request #3093 from Kevak/Shock-Collars
...
Shock Collars Are Now A Thing.
2017-10-03 20:16:10 -04:00
454fb160a8
Merge pull request #3112 from Citadel-Station-13/upstream-merge-31188
...
[MIRROR] Gives nightmares a random shadowling name
2017-10-03 20:15:31 -04:00
d72f1c380a
Merge pull request #3111 from Citadel-Station-13/upstream-merge-30998
...
[MIRROR] Issues created with the report issue button will contain the round ID
2017-10-03 20:15:11 -04:00
1c199d426b
Merge branch 'master' into upstream-merge-31034
2017-10-03 20:15:07 -04:00
d483932395
Merge pull request #3109 from Citadel-Station-13/upstream-merge-31232
...
[MIRROR] Fixes mech fab runtime
2017-10-03 20:13:06 -04:00
3e975eca09
Merge pull request #3107 from Citadel-Station-13/upstream-merge-31135
...
[MIRROR] Adds a var to minds that makes them immune to conversion
2017-10-03 20:12:43 -04:00
84d98d5973
Merge pull request #3106 from Citadel-Station-13/upstream-merge-31208
...
[MIRROR] Makes mobs on fire light up
2017-10-03 20:12:24 -04:00
b7473ec008
Automatic changelog generation for PR #3102 [ci skip]
2017-10-03 19:11:26 -05:00
b5e0981d62
Merge pull request #3102 from Citadel-Station-13/upstream-merge-31250
...
[MIRROR] Greatly speeds up bees
2017-10-03 20:11:25 -04:00
c522e7a6e8
Merge pull request #3101 from Citadel-Station-13/upstream-merge-31236
...
[MIRROR] Monkey Cubes expanding will give the new monkey an attack log with their creator
2017-10-03 20:11:13 -04:00
8fd4ca0fe4
Merge pull request #3100 from Citadel-Station-13/upstream-merge-31252
...
[MIRROR] Partial revert of #30763 (datum config refactor)
2017-10-03 20:10:56 -04:00
a3cea89134
Merge pull request #3099 from Citadel-Station-13/upstream-merge-31228
...
[MIRROR] fixes healguardians not being able to heal people
2017-10-03 20:10:42 -04:00
befcfd1f06
Merge pull request #3095 from Citadel-Station-13/upstream-merge-31202
...
[MIRROR] Organ initialization cleanup
2017-10-03 20:10:08 -04:00
601ccec26f
Merge pull request #3098 from Citadel-Station-13/upstream-merge-31253
...
[MIRROR] Fixes morgue maintenance radstorm protection
2017-10-03 19:49:37 -04:00
e66e99776f
Automatic changelog generation for PR #3096 [ci skip]
2017-10-03 18:49:24 -05:00
6e5322a722
Merge pull request #3096 from Citadel-Station-13/upstream-merge-31247
...
[MIRROR] Fixes humans having no examine feedback for soft crit
2017-10-03 19:49:22 -04:00
b9967e6453
Update medical.dm
2017-10-03 18:48:43 -05:00
0206e3f775
Update particle.dm
2017-10-03 18:48:18 -05:00
d3d0038b07
Server tools API update to 3.1.0.1
2017-10-03 18:47:51 -05:00
2ec77d2d9b
Merge pull request #31237 from Cyberboss/STAPIUpdate
...
Server tools API update to 3.1.0.1
2017-10-03 18:47:51 -05:00
dc9b438bd8
Update skeletons.dm
2017-10-03 18:47:01 -05:00
e4d6219f1d
Update brain_item.dm
2017-10-03 18:46:41 -05:00
c32a37a86f
Gives nightmares a random shadowling name
2017-10-03 18:41:38 -05:00
65a73bcefa
Gives nightmares a random shadowling name ( #31188 )
...
* fuck you ruined my !ONE COMMIT PR!
* !ONE COMMIT PR!
2017-10-03 18:41:37 -05:00
6b175cfc1c
Issues created with the report issue button will contain the round ID
2017-10-03 18:28:17 -05:00
dc41460926
Issues created with the report issue button will contain the round ID ( #30998 )
...
* Issues created with the report issue button will contain the round ID
* Update interface.dm
* More url encoding
* URL ENCODE THE PLANET!
* Server name
* Fix trevis
* Too many god damn fucking brackets here
2017-10-03 18:28:17 -05:00
037ea0ce13
Nightmare organs
2017-10-03 18:22:01 -05:00
b3d69ebe8e
Fixes mech fab runtime
2017-10-03 18:19:40 -05:00
67f0c2f41c
Fixes mech fab runtime ( #31232 )
...
* Dunno what the initial was about, it's a list.
* Proper fixup
* Typo
2017-10-03 18:19:40 -05:00
1782fbeed7
Adds the advanced medical scanner, gives one to the CMO
2017-10-03 18:16:29 -05:00
30957af0c0
Adds a var to minds that makes them immune to conversion
2017-10-03 18:15:20 -05:00
5c49bab3c5
Merge pull request #31135 from KorPhaeron/unconvertable
...
Adds a var to minds that makes them immune to conversion
2017-10-03 18:15:20 -05:00
LetterJay