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

3074 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
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
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
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -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
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
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
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
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
Unknown
d3837b76e8 Conflict Resolution 2019-03-28 19:41:16 -04:00
Anewbe
8ed384b38c Rewrites Atmospherics 2019-03-28 19:25:11 -04:00
Heroman
867eac413a Adds unique icon for ID restorer (courtesy of VerySoft) 2019-03-28 15:56:47 +10: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
2870ba8271 Merge pull request #4695 from VOREStation/upstream-merge-5856 
[MIRROR] Fixes candle sprites
 2019-03-27 20:54:57 -04:00
Novacat
94ae8fcc2a Update candle.dm 2019-03-27 20:23:59 -04:00
Unknown
eca7086b45 Conflict Resolution 2019-03-27 19:24:13 -04:00
Anewbe
ac34c4b763 Stasis bags don't murder patients 2019-03-27 19:18:13 -04:00
Novacat
ffed098bf6 Merge branch 'master' into upstream-merge-5856 2019-03-27 19:00:41 -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
Unknown
6636f1ba37 Conflict Resolution Part 2 2019-03-27 15:51:05 -04:00
Novacat
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
Novacat
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
Neerti
fe0b7373b3 Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it 2019-03-27 14:49:30 -04:00
Novacat
cfe200ffc9 Merge pull request #4665 from VOREStation/upstream-merge-5824 
[MIRROR] Fixes non-black/white paint buckets not actually having paint in them
 2019-03-27 14:12:46 -04:00
Spades
eb0e2ec1f5 Guns sounds refactor and improvements 2019-03-27 10:42:18 -04:00
Novacat
7a13562736 Merge pull request #4620 from VOREStation/upstream-merge-5779 
[MIRROR] Emergency tanks start full
 2019-03-27 03:40:45 -04:00
Unknown
03dcb65c01 Fixes most of the issues 2019-03-27 00:38:44 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Heroman3003
ca16b830b1 Added ID restoration terminal near HoP's office 2019-03-20 10:41:36 +10:00
Unknown
85be5a9166 [5654] Resolves Merge Error 
"But I wanted to play Hearts of Iron..."
"NO."
 2019-03-01 23:58:05 -05:00