Commit Graph

15589 Commits

Author SHA1 Message Date
Heroman
18e00b3617 Fixes micromechs using normal equipment 2019-04-08 06:16:53 +10:00
Heroman
9a2bcce710 Removes ability for non-player mice to open doors 2019-04-07 10:00:25 +10:00
Novacat
f73a757152 Merge pull request #4924 from VOREStation/upstream-merge-6025
[MIRROR] Replaces AI-controlled Maint Drones with AI-controlled Borg Shells
2019-04-06 14:56:27 -04:00
Unknown
c4860391b6 Conflict Resolution 2019-04-06 14:47:21 -04:00
Novacat
2be62bd672 Merge pull request #4922 from Novacat/nova-survival
Post-release Bugfixing
2019-04-06 13:50:00 -04:00
Unknown
0482da8c52 Ports two polaris bugfix PRs early 2019-04-06 12:21:24 -04:00
Neerti
1d59d8683c Replaces AI-controlled Maint Drones with AI-controlled Borg Shells 2019-04-06 05:07:05 -04:00
Neerti
b9b14144b0 Merge pull request #6036 from PrismaticGynoid/butchershack
Butcher shack PoI
2019-04-06 05:00:42 -04:00
Novacat
d7c7c073a5 Merge pull request #4868 from Novacat/nova-weapons
Adds liquidprotein rations
2019-04-05 17:17:53 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Heroman
7f53eb35c3 Provides proper shielding to areas meant to be shielded 2019-04-05 05:13:35 +10:00
Unknown
7ecddb11de Service Keys Too 2019-04-03 15:11:06 -04:00
Unknown
2a100c5cb1 Command key box 2019-04-03 15:11:06 -04:00
Heroman
9b56460487 Fixes a typo 2019-04-02 17:57:30 +10:00
Heroman3003
eebd7c64a9 Fixes passive and mostly passive mobs blocking the way all the time 2019-04-02 09:27:24 +10:00
Unknown
71ac951395 Merge remote-tracking branch 'VOREStation/master' into nova-weapons 2019-03-31 14:35:10 -04:00
Unknown
9197cfeaeb New Bluespace Sprites 2019-03-31 04:35:24 -04:00
Novacat
da63d0bacf Merge branch 'master' into nova-weapons 2019-03-30 23:00:48 -04:00
Unknown
9fa575698b Conflict Resolution 2019-03-30 20:13:49 -04:00
Neerti
5967a92f02 Lynx Fixes Runtimes 2019-03-30 18:51:00 -04:00
Novacat
2c07c85138 Adds New Alert Levels (#6019)
* Adds New Alert Levels
2019-03-30 18:29:12 -04:00
Neerti
f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -04:00
Novacat
63c6e7f308 Ports Stasis Cages from Baystation (#6017)
* Ports Stasis Cages from Baystation
2019-03-30 14:55:52 -04:00
Spades
a2ca1346c8 Merge pull request #4880 from Novacat/nova-pathfinder
Miscellaneous Fixes.
2019-03-30 10:06:03 -04:00
Heroman
6a2155a614 Removed clicking sound from timeclocks 2019-03-30 17:36:00 +10:00
Unknown
5ce5403b17 Apparently it exists and is in the wrong dmi 2019-03-30 00:52:46 -04:00
Unknown
42991bb551 Replaces clutch purse sprite
Sprite is temporary, but makes the item usable.
2019-03-30 00:19:09 -04:00
Unknown
6993bbc1ae I derped. Fixes derp. 2019-03-29 09:40:24 -04:00
Unknown
2f51ad0771 Travis Shut up 2019-03-29 09:40:24 -04:00
Unknown
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
Unknown
d7e248a09e Might need a little help for the last two... 2019-03-29 00:12:32 -04:00
Unknown
baffac60fc Lynx Fixes Runtimes
There are still a couple of remaining runtimes...
2019-03-28 23:50:37 -04:00
Novacat
4801fe8c8e Merge pull request #4860 from Heroman3003/id-restorer
Added ID restoration terminal
2019-03-28 22:03:17 -04:00
Novacat
9fd697e007 Merge pull request #4873 from VOREStation/upstream-merge-5997
[MIRROR] Beakers for Botany
2019-03-28 22:02:37 -04:00
Novacat
690dc5cbec Merge pull request #4864 from VOREStation/upstream-merge-6010
[MIRROR] Removes spammy keyboard noise from arcade machines
2019-03-28 22:02:21 -04:00
Novacat
d53ef70473 Merge pull request #4848 from VOREStation/upstream-merge-5996
[MIRROR] Fixed construction of fulltile electrochromic windows
2019-03-28 22:01:16 -04:00
Novacat
a7ee250193 Merge pull request #4844 from VOREStation/upstream-merge-5991
[MIRROR] Fixes drinks and adds new one.
2019-03-28 22:01:05 -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
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
Novacat
e47a99824c Update jammer.dm 2019-03-28 21:46:37 -04:00
Unknown
3aa0fdfda5 Removes conductive flags from VR stuff 2019-03-28 21:45:38 -04:00
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Novacat
21f4479636 Merge branch 'master' into upstream-merge-5991 2019-03-28 21:35:54 -04:00
Novacat
956809d681 Merge branch 'master' into upstream-merge-5985 2019-03-28 21:32:18 -04:00
Novacat
5ca397fb43 Merge pull request #4830 from VOREStation/upstream-merge-5960
[MIRROR] Reverts some real spacebrain gas
2019-03-28 21:29:55 -04:00
Novacat
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
Novacat
354a6b501b Update turf_changing.dm 2019-03-28 21:13:59 -04:00
Novacat
4a05c9e7e1 Merge pull request #4782 from VOREStation/upstream-merge-5966
[MIRROR] Fixes blast door issue, and slimesky being considered unjustified.
2019-03-28 21:07:14 -04:00
Novacat
a52d831113 Merge pull request #4779 from VOREStation/upstream-merge-5959
[MIRROR] Adds a new Shroud design
2019-03-28 20:45:50 -04:00
Novacat
809cb419e5 Merge pull request #4766 from VOREStation/upstream-merge-5953
[MIRROR] Fixes the 'cannot push thing being pulled' bug and other weirdness.
2019-03-28 20:45:35 -04:00