CitadelStationBot
|
68830dac71
|
Changes smes, cells, cell charger, terminals and apcs icons
|
2017-08-16 20:02:24 -05:00 |
|
LetterJay
|
6f1b78e12c
|
Merge pull request #2395 from Citadel-Station-13/upstream-merge-29937
[MIRROR] [s] Fixes MG turret firing while the user is stunned/cuffed/unconscious
|
2017-08-16 19:35:22 -05:00 |
|
LetterJay
|
60f4d552da
|
Merge pull request #2398 from Citadel-Station-13/upstream-merge-29912
[MIRROR] Removes meth explosion syringes
|
2017-08-16 19:34:51 -05:00 |
|
LetterJay
|
b1fef14cec
|
Merge pull request #2397 from Citadel-Station-13/upstream-merge-29688
[MIRROR] Nerfs L6 SAW Hollow Point Bullets from -10 armour penetration to -60 armour penetration.
|
2017-08-16 19:34:26 -05:00 |
|
LetterJay
|
057bed7863
|
Merge pull request #2394 from Citadel-Station-13/upstream-merge-29930
[MIRROR] Removes out of date colon operator log
|
2017-08-16 19:34:10 -05:00 |
|
LetterJay
|
865d16b3b4
|
Merge pull request #2392 from sirelgate/master
Fixing weird 'hook' from icon missmatch from side arm
|
2017-08-16 19:33:50 -05:00 |
|
Haresay
|
4bf8bd8eaa
|
Merge branch 'master' of https://github.com/sirelgate/Citadel-Station-13
|
2017-08-16 17:25:57 -06:00 |
|
Haresay
|
27d466bda4
|
handsidefix
|
2017-08-16 17:25:55 -06:00 |
|
CitadelStationBot
|
9176bbc129
|
Removes meth explosion syringes
|
2017-08-16 17:59:48 -05:00 |
|
CitadelStationBot
|
e5b7eefffe
|
Nerfs L6 SAW Hollow Point Bullets from -10 armour penetration to -60 armour penetration.
|
2017-08-16 17:53:39 -05:00 |
|
CitadelStationBot
|
c2d335b7da
|
[s] Fixes MG turret firing while the user is stunned/cuffed/unconscious
|
2017-08-16 17:50:28 -05:00 |
|
CitadelStationBot
|
46c43c7ae7
|
Removes out of date colon operator log
|
2017-08-16 17:49:13 -05:00 |
|
Haresay
|
564d2aef7a
|
attempting to correct and make xenos roundstart
|
2017-08-16 15:08:39 -06:00 |
|
Haresay
|
55c021b386
|
Update furrypeople.dm
|
2017-08-16 15:08:43 -05:00 |
|
LetterJay
|
2b9f59ca3d
|
bonesless pizza
|
2017-08-16 15:06:16 -05:00 |
|
LetterJay
|
c627cec04a
|
Merge pull request #2388 from sirelgate/master
Xeno Fix, Nerfing them.
|
2017-08-16 13:51:06 -05:00 |
|
LetterJay
|
d0f321a76c
|
Merge pull request #2390 from Citadel-Station-13/upstream-merge-29910
[MIRROR] Fixed mop inhand, adds new inhand for the advanced mop
|
2017-08-16 13:50:39 -05:00 |
|
CitadelStationBot
|
472e1c59c9
|
Fixed mop inhand, adds new inhand for the advanced mop
|
2017-08-16 13:08:39 -05:00 |
|
Haresay
|
6f20e222d3
|
xenofix
|
2017-08-16 11:55:40 -06:00 |
|
Haresay
|
aaaecf731c
|
xenonerfs
|
2017-08-16 11:35:36 -06:00 |
|
Haresay
|
bd48741a45
|
Xeno nerfs fixed
|
2017-08-16 11:22:57 -06:00 |
|
Haresay
|
e06288d41a
|
Xenonerfs
|
2017-08-16 10:31:03 -06:00 |
|
LetterJay
|
b9432d6619
|
Merge pull request #2387 from Citadel-Station-13/AlienDisable
Disables Roundstart Aliens
|
2017-08-16 09:56:38 -05:00 |
|
LetterJay
|
9831cbf399
|
Merge pull request #2382 from Citadel-Station-13/upstream-merge-29907
[MIRROR] Megafauna will now always show up in the orbit list
|
2017-08-16 09:44:46 -05:00 |
|
LetterJay
|
7e01d65374
|
Merge pull request #2383 from Citadel-Station-13/upstream-merge-29913
[MIRROR] fixes a blue tile on delta
|
2017-08-16 09:44:06 -05:00 |
|
LetterJay
|
fcd9f98644
|
Merge pull request #2386 from Citadel-Station-13/revert-2368-revert-2346-upstream-merge-29813
The wiki button now asks what page you want to be taken to [Fixed Edition]
|
2017-08-16 09:43:49 -05:00 |
|
LetterJay
|
b3e984af5b
|
Update furrypeople.dm
|
2017-08-16 09:41:55 -05:00 |
|
LetterJay
|
dd00a61466
|
Update interface.dm
|
2017-08-16 09:26:58 -05:00 |
|
LetterJay
|
cff50c5771
|
Revert "Revert "[MIRROR] The wiki button now asks what page you want to be taken to""
|
2017-08-16 09:25:32 -05:00 |
|
CitadelStationBot
|
96acbf9853
|
fixes a blue tile on delta
|
2017-08-16 01:11:29 -05:00 |
|
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 |
|
Haresay
|
67cd217681
|
bumped heat damage after calculating armor
|
2017-08-15 10:19:38 -06:00 |
|
CitadelStationBot
|
3d83b55cf6
|
Annihilates the colons!
|
2017-08-15 10:49:55 -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
|
de009b5283
|
Merge pull request #2374 from sirelgate/master
xenomorph round start update
|
2017-08-15 10:20:57 -05: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 |
|