Novacat
|
da5d9c5013
|
Merge pull request #4739 from VOREStation/upstream-merge-5924
[MIRROR] Stairs go up
|
2019-03-28 17:55:27 -04:00 |
|
Novacat
|
3a1c35f0ad
|
Merge pull request #4768 from VOREStation/upstream-merge-5954
[MIRROR] Makes aiming more clear for the target.
|
2019-03-28 17:46:02 -04:00 |
|
Novacat
|
7e90225e81
|
Merge pull request #4736 from VOREStation/upstream-merge-5918
[MIRROR] [READY] Fixes pixel projectiles critical bugs
|
2019-03-28 17:44:22 -04:00 |
|
Novacat
|
aab0d4625e
|
Merge pull request #4759 from VOREStation/upstream-merge-5935
[MIRROR] Nerfs Sonic Speed Wheelchair
|
2019-03-28 17:43:33 -04:00 |
|
Novacat
|
9759df2de4
|
Merge pull request #4756 from TheFurryFeline/TFF-Vakashi_Permit
Vakashi's Permit
|
2019-03-28 17:40:23 -04:00 |
|
Novacat
|
04c5080426
|
Merge pull request #4755 from VOREStation/upstream-merge-5940
[MIRROR] Fix a div/0.
|
2019-03-28 17:39:34 -04:00 |
|
Novacat
|
0c71725ab0
|
Merge pull request #4734 from VOREStation/upstream-merge-5846
[MIRROR] Adds multiple organ-related chemicals.
|
2019-03-28 17:37:32 -04:00 |
|
Novacat
|
f797a8a715
|
Merge pull request #4728 from VOREStation/upstream-merge-5899
[MIRROR] Ghosts who antagHUD can't make communicator calls
|
2019-03-28 17:25:35 -04:00 |
|
Novacat
|
0b71310df5
|
Merge pull request #4732 from VOREStation/upstream-merge-5909
[MIRROR] AFK Kicker stores AI cores
|
2019-03-28 17:25:22 -04:00 |
|
Novacat
|
c734e631a1
|
Merge pull request #4731 from VOREStation/upstream-merge-5908
[MIRROR] January News Update
|
2019-03-28 17:25:13 -04:00 |
|
Novacat
|
4040039d70
|
Merge pull request #4730 from VOREStation/upstream-merge-5912
[MIRROR] Mechs can travel to the mines again
|
2019-03-28 17:25:06 -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
|
352fe555f2
|
Update structures.dm
|
2019-03-28 16:33:29 -04:00 |
|
Novacat
|
be3ecb34ca
|
Merge pull request #4738 from VOREStation/upstream-merge-5913
[MIRROR] Readds access restrictions to supply computer
|
2019-03-28 16:31:58 -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 |
|
Unknown
|
75ede8c745
|
Fixes Merge Conflicts
|
2019-03-28 16:03:52 -04:00 |
|
Neerti
|
279ffc5dc9
|
[READY] Fixes pixel projectiles critical bugs
|
2019-03-28 15:56:47 -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 |
|
Unknown
|
62b141bbf0
|
Fixes compile error
|
2019-03-28 15:30:41 -04:00 |
|
Atermonera
|
f75332f455
|
Merge pull request #5846 from Mechoid/ChemicalsChemicalsChemicals!1
Adds multiple organ-related chemicals.
|
2019-03-28 15:28:13 -04:00 |
|
Unknown
|
5e6e193fb3
|
Rebases this correctly
|
2019-03-28 15:24:27 -04:00 |
|
Novacat
|
912111d5ea
|
Merge branch 'master' into upstream-merge-5908
|
2019-03-28 15:19:53 -04:00 |
|
Novacat
|
05cc6d7df3
|
Update step_triggers.dm
|
2019-03-28 15:18:23 -04:00 |
|
Novacat
|
8fcc46a6c9
|
Merge branch 'master' into upstream-merge-5912
|
2019-03-28 15:12:46 -04:00 |
|
Unknown
|
3e2d0bf9ea
|
Conflict Resolution Part Two
|
2019-03-28 15:09:40 -04:00 |
|
Atermonera
|
7403591727
|
Ghosts who antagHUD can't make communicator calls
|
2019-03-28 15:05:25 -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
|
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 |
|
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
|
1b2116bf80
|
Merge pull request #4714 from VOREStation/upstream-merge-5898
[MIRROR] Removes the hyphen from default language keys, should make people spew gibberish less
|
2019-03-27 21:32:03 -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 |
|