LetterJay
|
b9432d6619
|
Merge pull request #2387 from Citadel-Station-13/AlienDisable
Disables Roundstart Aliens
|
2017-08-16 09:56:38 -05:00 |
|
LetterJay
|
b3e984af5b
|
Update furrypeople.dm
|
2017-08-16 09:41:55 -05:00 |
|
CitadelStationBot
|
90e1bbd3e1
|
Megafauna will now always show up in the orbit list
|
2017-08-16 01:01:06 -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
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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
|
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
|
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
|
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 |
|
LetterJay
|
2719f23e52
|
Update shieldgen.dm
|
2017-08-14 18:53:01 -05:00 |
|
LetterJay
|
98ff124b68
|
Update shieldgen.dm
|
2017-08-14 18:50:44 -05:00 |
|
LetterJay
|
e90adf63fe
|
Merge branch 'master' into upstream-merge-29606
|
2017-08-14 18:48:42 -05:00 |
|
LetterJay
|
6d62d51eab
|
Merge pull request #2198 from Citadel-Station-13/upstream-merge-29288
[MIRROR] Hallucinations 3.0
|
2017-08-14 18:45:45 -05:00 |
|
LetterJay
|
ce918273bc
|
Merge pull request #2313 from Citadel-Station-13/upstream-merge-29779
[MIRROR] Fixes the Hierophant not spawning its crusher trophy
|
2017-08-14 18:45:28 -05:00 |
|
LetterJay
|
9b57f5fd62
|
Update collectable.dm
|
2017-08-14 18:39:22 -05:00 |
|
LetterJay
|
46c6a54a75
|
Update misc.dm
|
2017-08-14 18:38:55 -05:00 |
|
LetterJay
|
300fc768a5
|
Merge pull request #2265 from Citadel-Station-13/upstream-merge-29727
[MIRROR] The inhands of the Dark Blessing chaplain weapon is now visible.
|
2017-08-14 18:37:28 -05:00 |
|
LetterJay
|
1bb5e19596
|
Merge pull request #2255 from Citadel-Station-13/upstream-merge-29695
[MIRROR] flora.dm initialize hint
|
2017-08-14 18:36:58 -05:00 |
|
LetterJay
|
69bf7e42cf
|
Merge branch 'master' into upstream-merge-29288
|
2017-08-14 18:35:28 -05:00 |
|
Haresay
|
048c782156
|
xenomorph update
A long overdue overhall and readdition of xenos
|
2017-08-14 17:09:11 -06:00 |
|
CitadelStationBot
|
97243fca3a
|
Moved can_trigger_gun to item/weapon parent
|
2017-08-14 16:05:43 -05:00 |
|
CitadelStationBot
|
5fd3a8355c
|
Fixes the Resurrect Cultist rune not working
|
2017-08-14 16:05:33 -05:00 |
|