cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-31 11:22:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,384 Commits 8 Branches 26 Tags
6a287c7e1f0399d413df1e4fecdf018bfa3a1446
Commit Graph

4868 Commits

Author SHA1 Message Date
Novacat
6a287c7e1f Merge pull request #5085 from VOREStation/upstream-merge-6026 
[MIRROR] Precursotech Janus
 2019-04-18 02:19:31 -04:00
Mechoid
fc43527ac7 Adds Robobags (#6059) 
* Adds Robobags

* Finishes robobags

* FixFix
 2019-04-18 01:40:39 -04:00
Atermonera
b7e9934206 Precursotech Janus 2019-04-18 00:33:20 -04:00
Neerti
860ff31f08 Merge pull request #6094 from Heroman3003/anti-magic-markers 
Fixes markers and crayons drawing from a distance
 2019-04-16 23:09:02 -04:00
Neerti
3f7d2a0450 Fixes fireaxe cabinets 2019-04-16 22:00:42 -04:00
Novacat
2fa26d319c Merge pull request #5063 from VOREStation/upstream-merge-6086 
[MIRROR] Fixes self-refueling welders starting fires when off
 2019-04-15 18:41:31 -04:00
Neerti
197bedb2eb Merge pull request #6086 from Heroman3003/welder-fires 
Fixes self-refueling welders starting fires when off
 2019-04-15 18:31:37 -04:00
Neerti
99444fa0c8 Merge pull request #6085 from Heroman3003/apc-cost-fix 
Fixes apc frame giving more steel than needed
 2019-04-15 18:29:58 -04:00
Novacat
f391ddad02 Merge pull request #5038 from VOREStation/upstream-merge-6028 
[MIRROR] Precursotech Tools
 2019-04-14 02:29:25 -04:00
Novacat
47dac87f75 Merge pull request #5037 from VOREStation/upstream-merge-6027 
[MIRROR] Anomalotech Charge Sword
 2019-04-14 02:22:02 -04:00
Neerti
9c28b82c6c Merge pull request #6028 from Mechoid/Precursotech_Tools 
Precursotech Tools
 2019-04-14 02:20:07 -04:00
Neerti
94e6cc402b Merge pull request #6027 from Mechoid/Precursotech_Sword 
Anomalotech Charge Sword
 2019-04-14 01:21:05 -04:00
Neerti
d2cb1f67a3 Merge pull request #6024 from Mechoid/Precursotech_Sleepers 
Precurso / Anomalotech Sleepers
 2019-04-14 01:16:46 -04:00
Neerti
fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
Zap-zapper
acc9897320 Size control implant fix 2019-04-13 18:42:53 +07:00
Novacat
ab5710a015 Merge pull request #4881 from Heroman3003/borg-resization 
Borgs are now in on fun of size-related features
 2019-04-11 12:35:21 -04:00
Novacat
c1d44a008a Merge pull request #4966 from Novacat/nova-survival 
Rosettes, radiopack sprites
 2019-04-10 19:46:09 -04:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Unknown
5e9ac3f00d Rosettes, radiopack sprites 
- Adds Rosettes and Colorable Rosettes
- Adds on mob sprite for the subspace radio
 2019-04-08 14:07:24 -04:00
Unknown
c4860391b6 Conflict Resolution 2019-04-06 14:47:21 -04:00
Neerti
1d59d8683c Replaces AI-controlled Maint Drones with AI-controlled Borg Shells 2019-04-06 05:07:05 -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
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
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
Neerti
f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -04: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
Heroman
92956bc258 Added sizechanging module and size pref respect for borgs 2019-03-30 07:56:33 +10: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
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
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
956809d681 Merge branch 'master' into upstream-merge-5985 2019-03-28 21:32:18 -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
3f659d909c Merge pull request #4758 from VOREStation/upstream-merge-5947 
[MIRROR] Rewrites Atmospherics
 2019-03-28 20:22:30 -04:00
Unknown
d3837b76e8 Conflict Resolution 2019-03-28 19:41:16 -04:00
Anewbe
8ed384b38c Rewrites Atmospherics 2019-03-28 19:25:11 -04:00
Unknown
32bab4ba00 ...Part two 2019-03-28 19:08:04 -04:00
Unknown
58427861e8 Fixes compile error 2019-03-28 19:06:53 -04:00
Unknown
4df295de75 Conflict Resolution 2019-03-28 18:43:38 -04:00
Mechoid
023815e2d2 Flash rebalance. 2019-03-28 18:23:33 -04:00
Novacat
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
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