Unknown
|
efdb175d52
|
Conflict Resolution
|
2019-03-28 15:02:22 -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
|
15dac0304f
|
Merge pull request #4724 from VOREStation/upstream-merge-5877
[MIRROR] Unfucks Vintage Rifle
|
2019-03-28 14:42:43 -04:00 |
|
Novacat
|
741931aa31
|
Merge pull request #4723 from VOREStation/upstream-merge-5906
[MIRROR] Gives the auto shotgun a new sprite
|
2019-03-28 14:42:10 -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 |
|
Novacat
|
38a4e44526
|
Merge pull request #4713 from VOREStation/upstream-merge-5900
[MIRROR] Rig helmets are now airtight when they should be, rather than when they shouldn't
|
2019-03-27 21:20:56 -04:00 |
|
Novacat
|
d2cd4ff7b5
|
Merge pull request #4718 from VOREStation/upstream-merge-5893
[MIRROR] Additional Hair
|
2019-03-27 21:19:42 -04:00 |
|
Atermonera
|
ed933cedc8
|
Rig helmets are now airtight when they should be, rather than when they shouldn't
|
2019-03-27 21:12:31 -04:00 |
|
Novacat
|
e0597368d5
|
Merge pull request #4712 from VOREStation/upstream-merge-5895
[MIRROR] Fixes some AI bugs.
|
2019-03-27 21:08:01 -04:00 |
|
Novacat
|
ed85a74aa9
|
Merge pull request #4710 from VOREStation/upstream-merge-5894
[MIRROR] Fixes Some Mob Init Bugs
|
2019-03-27 20:55:09 -04:00 |
|
Neerti
|
519890613f
|
Fixes some AI bugs.
|
2019-03-27 20:54:31 -04:00 |
|
Novacat
|
1e5b351f43
|
Merge pull request #4711 from VOREStation/upstream-merge-5875
[MIRROR] Tommygun now Tommy Gun
|
2019-03-27 20:45:46 -04:00 |
|
Atermonera
|
cbf66a9b0b
|
Merge pull request #5894 from Neerti/pun_pun_fix
Fixes Some Mob Init Bugs
|
2019-03-27 20:42:50 -04:00 |
|
Novacat
|
893976536e
|
Merge pull request #4706 from VOREStation/upstream-merge-5889
[MIRROR] Allows borgs to move up and down with jetpacks
|
2019-03-27 20:39:35 -04:00 |
|
Novacat
|
b3ded9752c
|
Merge pull request #4708 from king5327/vplf
Fixes protean languages for real this time.
|
2019-03-27 20:39:03 -04:00 |
|
Novacat
|
f15ac5a224
|
Merge pull request #4697 from VOREStation/upstream-merge-5849
[MIRROR] Fixes a few mob AI bugs
|
2019-03-27 20:29:08 -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
|
2609d9fc2b
|
Merge branch 'master' into upstream-merge-5889
|
2019-03-27 20:15:17 -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 |
|
Novacat
|
3c7327ae54
|
Merge pull request #4699 from VOREStation/upstream-merge-5870
[MIRROR] Borgs can use audible emotes again
|
2019-03-27 19:15:04 -04:00 |
|
Neerti
|
04280c8372
|
Fixes a few mob AI bugs
|
2019-03-27 19:05:59 -04:00 |
|
Novacat
|
4c18bff57b
|
Merge pull request #4696 from VOREStation/upstream-merge-5859
[MIRROR] Audible emotes can be used again
|
2019-03-27 19:01:55 -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
|
01769ada6b
|
Merge pull request #4686 from VOREStation/upstream-merge-5840
[MIRROR] protolathe screen updates mat cost with better manips
|
2019-03-27 18:01:11 -04:00 |
|
Novacat
|
dce3466f3b
|
Merge pull request #4684 from VOREStation/upstream-merge-5814
[MIRROR] [READY]Makes a bunch of processes subsystems instead
|
2019-03-27 17:46:31 -04:00 |
|
Novacat
|
97e98dd04d
|
Merge pull request #4682 from VOREStation/upstream-merge-5829
[MIRROR] Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
|
2019-03-27 16:37:45 -04:00 |
|
Unknown
|
ec19a66eff
|
Conflict Resolution
|
2019-03-27 16:36:41 -04:00 |
|
kevinz000
|
6415e4193f
|
[READY]Makes a bunch of processes subsystems instead
|
2019-03-27 16:03:51 -04:00 |
|
Novacat
|
b717399d21
|
Merge pull request #4681 from VOREStation/upstream-merge-5838
[MIRROR] Fixes a couple of tiny glasses bugs
|
2019-03-27 15:51:48 -04:00 |
|
Unknown
|
6636f1ba37
|
Conflict Resolution Part 2
|
2019-03-27 15:51:05 -04:00 |
|
Unknown
|
55b4d304f5
|
Conflict Resolution Part One
|
2019-03-27 15:21:58 -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 |
|
Novacat
|
696872690e
|
Merge pull request #4677 from VOREStation/upstream-merge-5776
[MIRROR] Adds pressure protection bounds to clothing.
|
2019-03-27 15:18:17 -04:00 |
|
Novacat
|
7bd0f8e2db
|
Merge pull request #4676 from VOREStation/upstream-merge-5820
[MIRROR] Makes IC ticket response less rude
|
2019-03-27 15:18:06 -04:00 |
|
Novacat
|
d4f7e752eb
|
Merge pull request #4675 from VOREStation/upstream-merge-5828
[MIRROR] Fixes antagonist options not appearing in preferences
|
2019-03-27 15:17:38 -04:00 |
|
Novacat
|
c848a07f62
|
Merge pull request #4668 from VOREStation/upstream-merge-5815
[MIRROR] Adds eggnog drink to the game.
|
2019-03-27 15:17:14 -04:00 |
|
Novacat
|
a9f4906995
|
Merge pull request #4667 from VOREStation/upstream-merge-5772
[MIRROR] Refactors poi rotation to use degrees instead of dir
|
2019-03-27 15:16:02 -04:00 |
|
Neerti
|
fe0b7373b3
|
Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
|
2019-03-27 14:49:30 -04:00 |
|
Novacat
|
f4aad05ea1
|
Merge branch 'master' into upstream-merge-5838
|
2019-03-27 14:26:19 -04:00 |
|
Unknown
|
b3ee0e766f
|
Why is this even a conflict.
|
2019-03-27 14:24:57 -04:00 |
|
Novacat
|
5806e2d712
|
Merge pull request #4666 from VOREStation/upstream-merge-5826
[MIRROR] Blob factories now properly remove their listings from mobs when destroyed.
|
2019-03-27 14:12:59 -04:00 |
|
Novacat
|
0a170b1409
|
Merge pull request #4664 from VOREStation/upstream-merge-5827
[MIRROR] Fixes infinite microwave sound when recipe fails
|
2019-03-27 14:12:31 -04:00 |
|
Novacat
|
1599c9881d
|
Merge pull request #4661 from Heroman3003/fuck-is_multitool
Removes the usage of non-working is_tool procs
|
2019-03-27 14:12:08 -04:00 |
|
Novacat
|
823354433e
|
Merge pull request #4659 from VOREStation/upstream-merge-5796
[MIRROR] Adds New PoI Features + Bonus PoI
|
2019-03-27 13:52:46 -04:00 |
|
Novacat
|
b176b056e0
|
Merge pull request #4655 from VOREStation/upstream-merge-5793
[MIRROR] Upgrades SDQL2 and refactors it to a datum
|
2019-03-27 13:52:08 -04:00 |
|
Unknown
|
be1601bb68
|
Conflict Resolution
|
2019-03-27 13:51:07 -04:00 |
|
Neerti
|
9d46150515
|
Adds pressure protection bounds to clothing.
|
2019-03-27 13:26:07 -04:00 |
|