c4860391b6
Conflict Resolution
2019-04-06 14:47:21 -04:00
1d59d8683c
Replaces AI-controlled Maint Drones with AI-controlled Borg Shells
2019-04-06 05:07:05 -04:00
d7c7c073a5
Merge pull request #4868 from Novacat/nova-weapons
...
Adds liquidprotein rations
2019-04-05 17:17:53 -04:00
b11015107c
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
7ecddb11de
Service Keys Too
2019-04-03 15:11:06 -04:00
2a100c5cb1
Command key box
2019-04-03 15:11:06 -04:00
da63d0bacf
Merge branch 'master' into nova-weapons
2019-03-30 23:00:48 -04:00
9fa575698b
Conflict Resolution
2019-03-30 20:13:49 -04:00
5967a92f02
Lynx Fixes Runtimes
2019-03-30 18:51:00 -04:00
f8c9664178
Explorer Update - Cataloguers
2019-03-30 16:19:24 -04:00
5ce5403b17
Apparently it exists and is in the wrong dmi
2019-03-30 00:52:46 -04:00
42991bb551
Replaces clutch purse sprite
...
Sprite is temporary, but makes the item usable.
2019-03-30 00:19:09 -04:00
9c80690186
Adds liquidprotein rations
...
For obligate carnivores.
- Adds liquidprotein rations, they can be found in exploration, sweatmax vendors, and shelter capsules.
- Ups the price for protein shakes to discourage hoarding.
2019-03-29 09:40:24 -04:00
baffac60fc
Lynx Fixes Runtimes
...
There are still a couple of remaining runtimes...
2019-03-28 23:50:37 -04:00
4801fe8c8e
Merge pull request #4860 from Heroman3003/id-restorer
...
Added ID restoration terminal
2019-03-28 22:03:17 -04:00
26660c5f70
Merge pull request #4832 from VOREStation/upstream-merge-5985
...
[MIRROR] Subspace Jammer now blocks signalers, suit sensors, lasts longer
2019-03-28 21:59:48 -04:00
e47a99824c
Update jammer.dm
2019-03-28 21:46:37 -04:00
3aa0fdfda5
Removes conductive flags from VR stuff
2019-03-28 21:45:38 -04:00
30b967e28a
Items are now assumed to be conductive, rather than the opposite
2019-03-28 21:45:38 -04:00
956809d681
Merge branch 'master' into upstream-merge-5985
2019-03-28 21:32:18 -04:00
4c7370fb5d
Merge pull request #4811 from VOREStation/upstream-merge-5981
...
[MIRROR] Handtele no longer relies on teleporter being mapped in in very specific way
2019-03-28 21:28:30 -04:00
3f659d909c
Merge pull request #4758 from VOREStation/upstream-merge-5947
...
[MIRROR] Rewrites Atmospherics
2019-03-28 20:22:30 -04:00
d3837b76e8
Conflict Resolution
2019-03-28 19:41:16 -04:00
8ed384b38c
Rewrites Atmospherics
2019-03-28 19:25:11 -04:00
32bab4ba00
...Part two
2019-03-28 19:08:04 -04:00
58427861e8
Fixes compile error
2019-03-28 19:06:53 -04:00
4df295de75
Conflict Resolution
2019-03-28 18:43:38 -04:00
023815e2d2
Flash rebalance.
2019-03-28 18:23:33 -04:00
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
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
9d056decda
Adds the Zaddat Race + Modifies pressure damage calculations
2019-03-28 16:54:32 -04:00
b004d7d847
Merge pull request #4721 from VOREStation/upstream-merge-5901
...
[MIRROR] Unclogs powersink drains
2019-03-28 15:49:58 -04:00
3e2d0bf9ea
Conflict Resolution Part Two
2019-03-28 15:09:40 -04:00
7403591727
Ghosts who antagHUD can't make communicator calls
2019-03-28 15:05:25 -04:00
56752a1337
Merge branch 'master' into upstream-merge-5901
2019-03-28 14:37:02 -04:00
867eac413a
Adds unique icon for ID restorer (courtesy of VerySoft)
2019-03-28 15:56:47 +10:00
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
2870ba8271
Merge pull request #4695 from VOREStation/upstream-merge-5856
...
[MIRROR] Fixes candle sprites
2019-03-27 20:54:57 -04:00
94ae8fcc2a
Update candle.dm
2019-03-27 20:23:59 -04:00
eca7086b45
Conflict Resolution
2019-03-27 19:24:13 -04:00
ac34c4b763
Stasis bags don't murder patients
2019-03-27 19:18:13 -04:00
ffed098bf6
Merge branch 'master' into upstream-merge-5856
2019-03-27 19:00:41 -04:00
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
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
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
ec19a66eff
Conflict Resolution
2019-03-27 16:36:41 -04:00
6415e4193f
[READY]Makes a bunch of processes subsystems instead
2019-03-27 16:03:51 -04:00
6636f1ba37
Conflict Resolution Part 2
2019-03-27 15:51:05 -04:00
abcde8fe5f
Merge pull request #4680 from VOREStation/upstream-merge-5825
...
[MIRROR] Adds ability to put butts in boxes
2019-03-27 15:19:30 -04:00
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
Unknown