elgeonmb
|
9d056decda
|
Adds the Zaddat Race + Modifies pressure damage calculations
|
2019-03-28 16:54:32 -04:00 |
|
Novacat
|
a98ac52678
|
Merge pull request #4750 from VOREStation/upstream-merge-5886
[MIRROR] Introduces caseless ammo, and a caseless rifle
|
2019-03-28 16:40:13 -04:00 |
|
Novacat
|
77db377d61
|
Merge pull request #4748 from Heroman3003/mlembulance
Tempest's saddlebags now double as ambulance siren/light
|
2019-03-28 16:39:37 -04:00 |
|
Novacat
|
4bf687c243
|
Merge pull request #4746 from VOREStation/upstream-merge-5922
[MIRROR] reduces delay in printing from librarian computer
|
2019-03-28 16:38:18 -04:00 |
|
Novacat
|
f98177b682
|
Merge pull request #4741 from Jwguy/Silver-KoyoFluffApp
Adds Koyo's Fluff Item Box
|
2019-03-28 16:34:41 -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
|
07bbf88d0d
|
Merge pull request #4726 from VOREStation/upstream-merge-5905
[MIRROR] Woops I misse dit, removes the forced announce from atom proccall
|
2019-03-28 16:30:43 -04:00 |
|
Novacat
|
1eea84c861
|
Merge pull request #4722 from VOREStation/upstream-merge-5897
[MIRROR] Fixes some circuit bugs.
|
2019-03-28 16:30:33 -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 |
|
Unknown
|
efdb175d52
|
Conflict Resolution
|
2019-03-28 15:02:22 -04:00 |
|
Novacat
|
c570f25dd8
|
Merge branch 'master' into upstream-merge-5905
|
2019-03-28 14:55:54 -04:00 |
|
Novacat
|
a4919caba2
|
Merge pull request #4719 from VOREStation/upstream-merge-5636
[MIRROR] [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work
|
2019-03-28 14:52:51 -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 |
|
Unknown
|
2767f5917d
|
Fixes Conflict
|
2019-03-28 14:49:44 -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
|
cefd175858
|
Update time.dm
|
2019-03-28 14:41:14 -04:00 |
|
Novacat
|
09228247c2
|
Merge branch 'master' into upstream-merge-5897
|
2019-03-28 14:39:41 -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 |
|
Unknown
|
a4373601f0
|
Fixes Merge Errors
|
2019-03-28 13:53:03 -04:00 |
|
Unknown
|
cf39c61c2d
|
Conflict Resolution
This one made a lynx cry.
|
2019-03-28 13:19:19 -04:00 |
|
Neerti
|
3256202407
|
[READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work
|
2019-03-27 22:02:07 -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 |
|