CitadelStationBot
|
90e1bbd3e1
|
Megafauna will now always show up in the orbit list
|
2017-08-16 01:01:06 -05:00 |
|
LetterJay
|
a3803cb38f
|
Merge pull request #2358 from Citadel-Station-13/upstream-merge-29690
[MIRROR] [ready]Makes bIcon better
|
2017-08-15 20:45:00 -05:00 |
|
LetterJay
|
95cfe5baa0
|
Update browserOutput.dm
|
2017-08-15 19:48:26 -05:00 |
|
LetterJay
|
0ffaf66d1f
|
Merge branch 'master' into upstream-merge-29690
|
2017-08-15 19:18:22 -05:00 |
|
LetterJay
|
67194ef0db
|
Merge pull request #2315 from Citadel-Station-13/upstream-merge-29611
[MIRROR] Adds helpers to avoid << use
|
2017-08-15 19:17:43 -05:00 |
|
LetterJay
|
865c56afbf
|
Update areas.dm
|
2017-08-15 19:08:05 -05:00 |
|
LetterJay
|
d133510288
|
Update preferences_savefile.dm
|
2017-08-15 19:06:41 -05:00 |
|
LetterJay
|
24be45e6fa
|
Update sound.dm
|
2017-08-15 18:56:57 -05:00 |
|
LetterJay
|
ab27b63cf9
|
Merge branch 'master' into upstream-merge-29611
|
2017-08-15 18:55:12 -05:00 |
|
LetterJay
|
41c9cf3a4a
|
Update machinery.dm
|
2017-08-15 18:53:10 -05:00 |
|
LetterJay
|
c818168298
|
Merge pull request #2375 from Citadel-Station-13/upstream-merge-29499
[MIRROR] ❄ --- ==== D E E P F R E E Z E ==== --- ❄
|
2017-08-15 17:20:27 -05:00 |
|
LetterJay
|
3536e2985f
|
Merge pull request #2380 from Citadel-Station-13/upstream-merge-29812
[MIRROR] Annihilates the colons!
|
2017-08-15 17:20:14 -05:00 |
|
CitadelStationBot
|
3d83b55cf6
|
Annihilates the colons!
|
2017-08-15 10:49:55 -05:00 |
|
LetterJay
|
de009b5283
|
Merge pull request #2374 from sirelgate/master
xenomorph round start update
|
2017-08-15 10:20:57 -05:00 |
|
Haresay
|
b65234b733
|
rebalanced armor downward, removed stunmod, and made more vulnerable to heat thanks to Pierceimmune being added
|
2017-08-15 09:33:31 -06:00 |
|
Haresay
|
7eaaa2e647
|
lowered armor value,in search of fixing digitigradelegs
|
2017-08-15 09:25:51 -06:00 |
|
Haresay
|
93ae8c0e44
|
did some number crunching in regards to armor and practiced, balanced more, still no shoes from digitgrade
|
2017-08-15 09:21:08 -06:00 |
|
LetterJay
|
6539ccf061
|
Merge pull request #2379 from Citadel-Station-13/upstream-merge-29888
[MIRROR] Makes IRC status return round id
|
2017-08-15 10:14:56 -05:00 |
|
LetterJay
|
6cad8ecacd
|
Merge pull request #2378 from Citadel-Station-13/upstream-merge-29384
[MIRROR] Deathsquads no longer get shielded hardsuits
|
2017-08-15 10:14:35 -05:00 |
|
CitadelStationBot
|
662786ba59
|
Automatic changelog generation for PR #2377 [ci skip]
|
2017-08-15 10:12:30 -05:00 |
|
LetterJay
|
49e4f8675c
|
Merge pull request #2377 from Citadel-Station-13/upstream-merge-29890
[MIRROR] Fixes mining hardsuit heat_protection
|
2017-08-15 10:12:29 -05:00 |
|
CitadelStationBot
|
6c3b6a261a
|
Automatic changelog generation for PR #2376 [ci skip]
|
2017-08-15 10:12:15 -05:00 |
|
LetterJay
|
466a2aa2a1
|
Merge pull request #2376 from Citadel-Station-13/upstream-merge-29884
[MIRROR] Fixes Singulo, Tesla, Reality Breaks, & Narsie being frozen by freon
|
2017-08-15 10:12:13 -05:00 |
|
CitadelStationBot
|
f6babfeb8a
|
Makes IRC status return round id
|
2017-08-15 10:01:57 -05:00 |
|
CitadelStationBot
|
313ba00dd5
|
Deathsquads no longer get shielded hardsuits
|
2017-08-15 09:59:51 -05:00 |
|
Haresay
|
1cc9a1decf
|
set xeno standard parts to be default
|
2017-08-15 08:06:59 -06:00 |
|
Haresay
|
22ad3c6afe
|
xeno markings addition
added markings to the xenomorph, for polish
|
2017-08-15 08:03:08 -06:00 |
|
Haresay
|
5885d490ac
|
futher updates to head and spines
head and spine updates
|
2017-08-15 07:35:35 -06:00 |
|
Haresay
|
a8c706126d
|
headupdates
|
2017-08-15 07:25:47 -06:00 |
|
Haresay
|
fdc4a4403b
|
headupdate
|
2017-08-15 07:02:57 -06:00 |
|
CitadelStationBot
|
402b9a6cab
|
Fixes mining hardsuit heat_protection
|
2017-08-15 05:55:57 -05:00 |
|
CitadelStationBot
|
3b1a0a0dc0
|
Fixes Singulo, Tesla, Reality Breaks, & Narsie being frozen by freon
|
2017-08-15 05:11:08 -05:00 |
|
CitadelStationBot
|
7e351b9b8e
|
❄ --- ==== D E E P F R E E Z E ==== --- ❄
|
2017-08-15 05:09:00 -05:00 |
|
LetterJay
|
04a273eb8e
|
Merge pull request #2213 from Citadel-Station-13/upstream-merge-29606
[MIRROR] Fixes the fruity pebbles in the code
|
2017-08-14 22:18:28 -05:00 |
|
LetterJay
|
62eee8804e
|
Merge pull request #2337 from Citadel-Station-13/upstream-merge-29815
[MIRROR] Fixes bad dirs
|
2017-08-14 22:18:07 -05:00 |
|
CitadelStationBot
|
c4090f5484
|
Automatic changelog generation for PR #2278 [ci skip]
|
2017-08-14 20:48:23 -05:00 |
|
LetterJay
|
905cb4a3e8
|
Merge pull request #2278 from Citadel-Station-13/upstream-merge-29651
[MIRROR] Fixes hair sticking through hats.
|
2017-08-14 20:48:21 -05:00 |
|
LetterJay
|
4522ba54ae
|
Merge pull request #2364 from Citadel-Station-13/upstream-merge-29885
[MIRROR] [s] Clean up some inputs
|
2017-08-14 20:48:02 -05:00 |
|
LetterJay
|
31b501aa1a
|
Merge branch 'master' into upstream-merge-29885
|
2017-08-14 19:41:45 -05:00 |
|
LetterJay
|
bda5e94afc
|
Merge pull request #2365 from Citadel-Station-13/upstream-merge-29886
[MIRROR] Fix compile warning
|
2017-08-14 19:41:03 -05:00 |
|
LetterJay
|
1d4e15502a
|
Update browserOutput.dm
|
2017-08-14 19:40:45 -05:00 |
|
LetterJay
|
64b3fe43d9
|
Update shieldgen.dm
|
2017-08-14 19:38:43 -05:00 |
|
LetterJay
|
88e9937425
|
Merge pull request #2316 from Citadel-Station-13/upstream-merge-29758
[MIRROR] updates brain damage lines
|
2017-08-14 19:37:50 -05:00 |
|
LetterJay
|
77025ae8a2
|
Merge branch 'master' into upstream-merge-29651
|
2017-08-14 19:37:09 -05:00 |
|
LetterJay
|
0c72b3ec53
|
Update world.dm
|
2017-08-14 19:09:51 -05:00 |
|
LetterJay
|
f2c011a37b
|
Update console.dm
|
2017-08-14 18:55:25 -05:00 |
|
LetterJay
|
65a7e9978c
|
Merge pull request #2370 from Citadel-Station-13/upstream-merge-29880
[MIRROR] Unlocked miner closet in Pubby aux_base dock
|
2017-08-14 18:54:05 -05:00 |
|
CitadelStationBot
|
d8e7194e6d
|
Automatic changelog generation for PR #2371 [ci skip]
|
2017-08-14 18:53:54 -05:00 |
|
LetterJay
|
b962876d38
|
Merge pull request #2371 from Citadel-Station-13/upstream-merge-29868
[MIRROR] Fixes the Resurrect Cultist rune not working
|
2017-08-14 18:53:53 -05:00 |
|
LetterJay
|
e5cd79a14e
|
Merge pull request #2373 from Citadel-Station-13/upstream-merge-29854
[MIRROR] Moved can_trigger_gun to item/weapon parent
|
2017-08-14 18:53:38 -05:00 |
|