Novacat
|
db710b61f1
|
Merge pull request #4842 from VOREStation/upstream-merge-5988
[MIRROR] Copy character slots
|
2019-03-28 22:00:38 -04:00 |
|
Novacat
|
e2afa12e38
|
Merge pull request #4841 from VOREStation/upstream-merge-5992
[MIRROR] Departmental Turtlenecks
|
2019-03-28 22:00:31 -04:00 |
|
Novacat
|
5256452ea5
|
Merge pull request #4836 from VOREStation/upstream-merge-5989
[MIRROR] golegnahC setadpU
|
2019-03-28 21:59:56 -04:00 |
|
Unknown
|
e2b62f857d
|
Conflict Resolution
|
2019-03-28 21:49:05 -04:00 |
|
Novacat
|
956809d681
|
Merge branch 'master' into upstream-merge-5985
|
2019-03-28 21:32:18 -04:00 |
|
Novacat
|
785a36d4e0
|
Merge pull request #4783 from VOREStation/upstream-merge-5942
[MIRROR] Headgibbing is a config thing
|
2019-03-28 21:27:19 -04:00 |
|
Novacat
|
e7e59730ea
|
Merge pull request #4784 from VOREStation/upstream-merge-5956
[MIRROR] Nock masks, cowls & robes
|
2019-03-28 21:07:21 -04:00 |
|
Neerti
|
15e3c04ca3
|
Nock masks, cowls & robes
|
2019-03-28 20:42:42 -04:00 |
|
Neerti
|
256fb03dcc
|
Merge pull request #5942 from Anewbe/headgibs
Headgibbing is a config thing
|
2019-03-28 20:38:34 -04:00 |
|
Neerti
|
a928244613
|
Tweaks Daxons
|
2019-03-28 20:29:05 -04:00 |
|
Neerti
|
8e86e8383e
|
Bugspeak is whitelisted
|
2019-03-28 19:51:07 -04:00 |
|
Novacat
|
f1da5f1f55
|
Merge pull request #4752 from VOREStation/upstream-merge-5907
[MIRROR] Flash rebalance.
|
2019-03-28 19:26:34 -04:00 |
|
Anewbe
|
9959a566bd
|
Rigsuits use the correct pressure protection mechanism
|
2019-03-28 18:55:23 -04:00 |
|
Mechoid
|
023815e2d2
|
Flash rebalance.
|
2019-03-28 18:23:33 -04:00 |
|
Novacat
|
65cd059497
|
Merge pull request #4751 from VOREStation/upstream-merge-5869
[MIRROR] Adds the Zaddat Race + Modifies pressure damage calculations
|
2019-03-28 18:17:11 -04:00 |
|
Novacat
|
da5d9c5013
|
Merge pull request #4739 from VOREStation/upstream-merge-5924
[MIRROR] Stairs go up
|
2019-03-28 17:55:27 -04:00 |
|
elgeonmb
|
9d056decda
|
Adds the Zaddat Race + Modifies pressure damage calculations
|
2019-03-28 16:54:32 -04:00 |
|
Novacat
|
a4d4eb0273
|
Merge pull request #4737 from VOREStation/upstream-merge-5910
[MIRROR] Pilot consoles require pilot access
|
2019-03-28 16:31:05 -04:00 |
|
Novacat
|
615f413354
|
Merge pull request #4727 from VOREStation/upstream-merge-5798
[MIRROR] Adds Alien Reality pods, aka AR pods, for use in events or PoIs.
|
2019-03-28 16:30:53 -04:00 |
|
Novacat
|
b004d7d847
|
Merge pull request #4721 from VOREStation/upstream-merge-5901
[MIRROR] Unclogs powersink drains
|
2019-03-28 15:49:58 -04:00 |
|
Novacat
|
1827a34381
|
Merge pull request #4674 from VOREStation/upstream-merge-5823
[MIRROR] Egun stun beams are weaker
|
2019-03-28 15:49:06 -04:00 |
|
Novacat
|
81d698b94c
|
Merge pull request #4643 from VOREStation/upstream-merge-5790
[MIRROR] Drop the number of shots of normal and sec-xeno tasers back down to 5.
|
2019-03-28 15:48:47 -04:00 |
|
Mechoid
|
c604e38036
|
Adds Alien Reality pods, aka AR pods, for use in events or PoIs.
|
2019-03-28 14:51:50 -04:00 |
|
Novacat
|
56752a1337
|
Merge branch 'master' into upstream-merge-5901
|
2019-03-28 14:37:02 -04:00 |
|
Novacat
|
3a0dbf687b
|
Merge pull request #4720 from VOREStation/upstream-merge-5896
[MIRROR] Changeling & Straight Jacket modifications.
|
2019-03-28 14:35:51 -04:00 |
|
Atermonera
|
db1fdccdd5
|
Merge pull request #5898 from Anewbe/more_gibberish
Removes the hyphen from default language keys, should make people spew gibberish less
|
2019-03-27 21:15:27 -04:00 |
|
Novacat
|
57a6c51691
|
Merge pull request #4700 from VOREStation/upstream-merge-5872
[MIRROR] Stasis bags don't murder patients
|
2019-03-27 20:29:29 -04:00 |
|
Novacat
|
62820d333a
|
Merge pull request #4690 from VOREStation/upstream-merge-5841
[MIRROR] Voice changer tweaks and fixes
|
2019-03-27 20:27:42 -04:00 |
|
Novacat
|
2a28a46e1a
|
Merge pull request #4703 from VOREStation/upstream-merge-5855
[MIRROR] Fixes Teshari hardsuits + adds sprites for most
|
2019-03-27 19:26:12 -04:00 |
|
Novacat
|
8ff24f1c30
|
Merge pull request #4702 from VOREStation/upstream-merge-5885
[MIRROR] Bots don't speak gibberish
|
2019-03-27 19:25:50 -04:00 |
|
Anewbe
|
ac34c4b763
|
Stasis bags don't murder patients
|
2019-03-27 19:18:13 -04:00 |
|
Novacat
|
aefedea4a3
|
Merge pull request #4694 from VOREStation/upstream-merge-5858
[MIRROR] Suit coolers don't overheat in vacuum
|
2019-03-27 18:58:47 -04:00 |
|
Atermonera
|
20604f2952
|
Merge pull request #5841 from Anewbe/voice_changer
Voice changer tweaks and fixes
|
2019-03-27 18:57:49 -04:00 |
|
Novacat
|
713e33054e
|
Merge pull request #4688 from VOREStation/upstream-merge-5843
[MIRROR] Adds Gibberish
|
2019-03-27 18:01:56 -04:00 |
|
Novacat
|
1bbb64494e
|
Merge pull request #4678 from VOREStation/upstream-merge-5835
[MIRROR] Updates Religion Lists + Adds Religious Paraphernalia
|
2019-03-27 15:19:15 -04:00 |
|
Neerti
|
9d46150515
|
Adds pressure protection bounds to clothing.
|
2019-03-27 13:26:07 -04:00 |
|
Anewbe
|
b8360ae0e8
|
Fixes #5780
|
2019-03-27 10:31:59 -04:00 |
|
Anewbe
|
09b01407e3
|
Adds Various Sounds, Looping Sound System
|
2019-03-27 03:55:21 -04:00 |
|
Novacat
|
7a13562736
|
Merge pull request #4620 from VOREStation/upstream-merge-5779
[MIRROR] Emergency tanks start full
|
2019-03-27 03:40:45 -04:00 |
|
Neerti
|
e2557228dc
|
Copy character slots
|
2019-03-08 20:17:46 -05:00 |
|
Atermonera
|
bf7686cd02
|
Merge pull request #5992 from mistyLuminescence/turtlenecks
Departmental Turtlenecks
|
2019-03-08 01:45:09 -05:00 |
|
Anewbe
|
580c41cf1f
|
golegnahC setadpU
|
2019-03-06 14:20:38 -05:00 |
|
Neerti
|
627cdecf66
|
Subspace Jammer now blocks signalers, suit sensors, lasts longer
|
2019-03-04 22:58:41 -05:00 |
|
Spades
|
c3479bd409
|
Merge pull request #4571 from VOREStation/upstream-merge-5768
[MIRROR] Updates changelog
|
2019-03-02 20:50:27 -05:00 |
|
Spades
|
14fad52791
|
Merge branch 'master' into upstream-merge-5744
|
2019-02-23 11:51:40 -05:00 |
|
Poojawa
|
6f2548e47b
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream/upstream-merge-5735
|
2019-02-02 03:55:21 -06:00 |
|
Neerti
|
ca044dcc2b
|
Stairs go up
|
2019-02-01 21:40:21 -05:00 |
|
Neerti
|
3f90fb2e7d
|
Merge pull request #5910 from Anewbe/pilot_console_id
Pilot consoles require pilot access
|
2019-02-01 18:01:36 -05:00 |
|
Atermonera
|
439afee2ab
|
Unclogs powersink drains
|
2019-01-26 17:54:34 -05:00 |
|
Atermonera
|
4a12e63534
|
Merge pull request #5896 from Mechoid/A_Tale_Of_Jackets_And_Changelings
Changeling & Straight Jacket modifications.
|
2019-01-26 14:12:47 -05:00 |
|