 ShizCalev
|
4d23dd56b8
|
Sets KEEP_TOGETHER appearance_flag for humans, energy draining text updated to DisplayPower (#31150)
* Hides ninja socks, draining updated to DisplayPower
* CB
* KEEP_TOGETHER
|
2017-10-04 16:29:30 -05:00 |
|
|
LetterJay
|
282dcb3c16
|
Merge pull request #3121 from Citadel-Station-13/upstream-merge-31267
[MIRROR] Dummies used for preference setup always immediately compile their overlays
|
2017-10-04 12:29:21 -04:00 |
|
|
LetterJay
|
6fec59e75b
|
Merge pull request #3120 from Citadel-Station-13/upstream-merge-31268
[MIRROR] Hotfix: Fixes Carpsie nullrod from being invisible
|
2017-10-04 12:28:59 -04:00 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
CitadelStationBot
|
67bf519df5
|
Automatic changelog generation for PR #3115 [ci skip]
|
2017-10-04 11:28:16 -05:00 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
CitadelStationBot
|
8ece467024
|
Dummies used for preference setup always immediately compile their overlays
|
2017-10-04 11:03:47 -05:00 |
|
|
Jordan Brown
|
cbf7ff0fc7
|
Dummies used for preference setup always compile overlays (#31267)
|
2017-10-04 11:03:47 -05:00 |
|
|
CitadelStationBot
|
a0d4bd8813
|
Hotfix: Fixes Carpsie nullrod from being invisible
|
2017-10-04 11:00:34 -05:00 |
|
|
ExcessiveUseOfCobblestone
|
fe5b45dfeb
|
Fixes Carpsie nullrod from being invisible (#31268)
|
2017-10-04 11:00:34 -05:00 |
|
|
CitadelStationBot
|
63d9d2facb
|
Adds missing abductor metal sheet sprites
|
2017-10-04 06:15:07 -05:00 |
|
|
Leo
|
5b8eb58266
|
Merge pull request #31260 from ShizCalev/alium-sheets
Adds missing abductor metal sheet sprites
|
2017-10-04 06:15:07 -05:00 |
|
|
CitadelStationBot
|
90bd29cba5
|
Fixes species locked slots alpha.
|
2017-10-04 06:12:46 -05:00 |
|
|
Leo
|
951c9d04f2
|
Merge pull request #31261 from AnturK/lockedslot
Fixes species locked slots alpha.
|
2017-10-04 06:12:46 -05:00 |
|
|
CitadelStationBot
|
85e74900cb
|
Makes gutlunches hungry for gibs again
|
2017-10-04 04:11:33 -05:00 |
|
|
vuonojenmustaturska
|
cdc7695741
|
Makes gutlunches hungry for gibs again (#31241)
* gutlunch fix
* combine ifs, removes unneeded check
|
2017-10-04 04:11:33 -05:00 |
|
|
CitadelStationBot
|
daa5bc6128
|
Automatic changelog generation for PR #3110 [ci skip]
|
2017-10-04 01:14:23 -05:00 |
|
|
LetterJay
|
0515d2b754
|
Merge pull request #3110 from Citadel-Station-13/upstream-merge-31034
[MIRROR] Nightmare organs
|
2017-10-04 02:14:22 -04:00 |
|
|
CitadelStationBot
|
07e407a02f
|
Automatic changelog generation for PR #3108 [ci skip]
|
2017-10-04 01:14:09 -05:00 |
|
|
LetterJay
|
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 |
|
|
CitadelStationBot
|
3a5e3bc530
|
Automatic changelog generation for PR #3104 [ci skip]
|
2017-10-04 01:13:37 -05:00 |
|
|
LetterJay
|
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 |
|
|
CitadelStationBot
|
f8f278dfd5
|
Automatic changelog generation for PR #3093 [ci skip]
|
2017-10-03 19:16:12 -05:00 |
|
|
LetterJay
|
0830e6907e
|
Merge pull request #3093 from Kevak/Shock-Collars
Shock Collars Are Now A Thing.
|
2017-10-03 20:16:10 -04:00 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
1c199d426b
|
Merge branch 'master' into upstream-merge-31034
|
2017-10-03 20:15:07 -04:00 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
CitadelStationBot
|
b7473ec008
|
Automatic changelog generation for PR #3102 [ci skip]
|
2017-10-03 19:11:26 -05:00 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
befcfd1f06
|
Merge pull request #3095 from Citadel-Station-13/upstream-merge-31202
[MIRROR] Organ initialization cleanup
|
2017-10-03 20:10:08 -04:00 |
|
|
LetterJay
|
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 |
|
|
CitadelStationBot
|
e66e99776f
|
Automatic changelog generation for PR #3096 [ci skip]
|
2017-10-03 18:49:24 -05:00 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
b9967e6453
|
Update medical.dm
|
2017-10-03 18:48:43 -05:00 |
|
|
LetterJay
|
0206e3f775
|
Update particle.dm
|
2017-10-03 18:48:18 -05:00 |
|
|
CitadelStationBot
|
d3d0038b07
|
Server tools API update to 3.1.0.1
|
2017-10-03 18:47:51 -05:00 |
|
|
oranges
|
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 |
|
|
LetterJay
|
dc9b438bd8
|
Update skeletons.dm
|
2017-10-03 18:47:01 -05:00 |
|
|
LetterJay
|
e4d6219f1d
|
Update brain_item.dm
|
2017-10-03 18:46:41 -05:00 |
|
|
CitadelStationBot
|
c32a37a86f
|
Gives nightmares a random shadowling name
|
2017-10-03 18:41:38 -05:00 |
|
|
Armhulen
|
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 |
|
|
CitadelStationBot
|
6b175cfc1c
|
Issues created with the report issue button will contain the round ID
|
2017-10-03 18:28:17 -05:00 |
|