cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 05:08:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,835 Commits 9 Branches 26 Tags
690dc5cbecdafb59df8753bfae72176e3d2f8e54
Commit Graph

22192 Commits

Author SHA1 Message Date
Unknown
a92eb4a414 Reverts to Polaris File 2019-03-27 12:50:51 -04:00
Neerti
373e1c766a Fixes infinite microwave sound when recipe fails 2019-03-27 12:45:09 -04:00
Novacat
42df71908b Merge pull request #4644 from VOREStation/upstream-merge-5803 
[MIRROR] Guns sounds refactor and improvements
 2019-03-27 12:35:26 -04:00
Unknown
54b1d524ea Conflict Resolution 2019-03-27 12:19:15 -04:00
Neerti
91a5203e32 Adds New PoI Features + Bonus PoI 2019-03-27 12:15:50 -04:00
Novacat
dbd85f3243 Merge pull request #4656 from VOREStation/upstream-merge-5816 
[MIRROR] Guns should once again let people know that they've been fired
 2019-03-27 12:07:35 -04:00
Unknown
0e6c82ed60 Conflict Resolution 2019-03-27 12:05:38 -04:00
kevinz000
dfbd0bd72b Upgrades SDQL2 and refactors it to a datum 2019-03-27 11:50:49 -04:00
Novacat
b91b10aaa5 Merge pull request #4642 from TheFurryFeline/patch-2 
Boost Belly Limit
 2019-03-27 11:22:30 -04:00
Novacat
2670a031d6 Merge pull request #4640 from VOREStation/upstream-merge-5806 
[MIRROR] Fixes #5780
 2019-03-27 11:22:02 -04:00
Novacat
682b06f126 Merge pull request #4639 from VOREStation/upstream-merge-5809 
[MIRROR] Allows Prometheans to choose Sol Common as a language.
 2019-03-27 11:21:54 -04:00
Unknown
1e45296d31 Conflict Resolution 2019-03-27 10:58:53 -04:00
Spades
eb0e2ec1f5 Guns sounds refactor and improvements 2019-03-27 10:42:18 -04:00
Anewbe
b8360ae0e8 Fixes #5780 2019-03-27 10:31:59 -04:00
Spades
60ce08ef82 Fixes a typo that broke the saketini recipe (#5807) 
Ported from https://github.com/VOREStation/VOREStation/pull/4534
 2019-03-27 10:28:43 -04:00
Novacat
db08a8dd60 Merge pull request #4631 from VOREStation/upstream-merge-5804 
[MIRROR] IC News update for 1st Jan
 2019-03-27 04:49:46 -04:00
Novacat
70d0a30868 Merge pull request #4635 from TheFurryFeline/master 
Holocollar Addition to Autolathe. Take 3
 2019-03-27 04:46:02 -04:00
Novacat
dc617243e9 Merge pull request #4634 from Verkister/patch-31 
Tweaks borg belly passive drain.
 2019-03-27 04:45:53 -04:00
Novacat
d8d0ccb682 Merge pull request #4630 from VOREStation/upstream-merge-5799 
[MIRROR] Fixes Character Preview
 2019-03-27 04:45:27 -04:00
Novacat
7ce67d9fb8 Merge pull request #4629 from VOREStation/upstream-merge-5802 
[MIRROR] Dragging mobs now causes slowdown
 2019-03-27 04:45:14 -04:00
Unknown
039b6c2b6c Why is this even a conflict 2019-03-27 04:41:57 -04:00
Atermonera
49bdfc2db6 IC News update for 1st Jan 2019-03-27 04:41:39 -04:00
Anewbe
0e75d3ad8b Merge pull request #5799 from Neerti/character_preview_fix 
Fixes Character Preview
 2019-03-27 04:27:15 -04:00
Unknown
4e67e1b9ab Conflict Resolution 2019-03-27 04:11:30 -04:00
Anewbe
09b01407e3 Adds Various Sounds, Looping Sound System 2019-03-27 03:55:21 -04:00
Novacat
8cb235f1e7 Merge pull request #4615 from VOREStation/upstream-merge-5795 
[MIRROR] Standardises SifGov to VirGov
 2019-03-27 03:40:16 -04:00
Unknown
486602c194 Conflict Resolution 2019-03-27 03:27:53 -04:00
Neerti
b9adc37685 Standardizes rotation verbs 2019-03-27 03:17:07 -04:00
Novacat
1d0bb53293 Merge pull request #4597 from VOREStation/upstream-merge-5786 
[MIRROR] Fixes issue #5788.
 2019-03-27 03:03:40 -04:00
Novacat
0b13775536 Merge pull request #4596 from VOREStation/upstream-merge-5783 
[MIRROR] Removes "allowed_roles" from Cloaks
 2019-03-27 03:03:09 -04:00
Novacat
39101cdb43 Merge pull request #4591 from VOREStation/upstream-merge-5764 
[MIRROR] Event / Future PoI / Other weaponry & tools.
 2019-03-27 02:46:36 -04:00
Novacat
84c2b53ce2 Merge pull request #4589 from VOREStation/upstream-merge-5773 
[MIRROR] Adds Identification System, New Autoinjectors
 2019-03-27 02:46:25 -04:00
Unknown
c8ca8efa62 Conflict Resolution 2019-03-27 02:37:20 -04:00
Mechoid
c8006a6e84 Event / Future PoI / Other weaponry & tools. 2019-03-27 02:34:28 -04:00
Neerti
585b688709 Adds Identification System, New Autoinjectors 2019-03-27 02:25:55 -04:00
Neerti
1dd3bb4532 Stops initialization from grinding to a halt when loading maps 2019-03-27 01:49:25 -04:00
Unknown
e298f07340 Replaces schedule_callback_in 
...Tested the bell, hopefully the xenochimera revives also work
 2019-03-27 01:33:54 -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
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -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
Haery70
65ac826da1 Fixes a spriting issue in mobvore 
As the title says.
 2019-03-16 21:16:08 -04:00
Heroman
6d625df7b4 return of the spider queen 2019-03-13 16:10:10 +10:00
Screemonster
69d4688e28 Unpicks some mining spaghetti (#5978) 
* Untangle xenoarch from mining somewhat

* professionalism

* sonic jackhammers only for artefact-safe tunnelling

* destroy artefacts code disabled on everything
 2019-03-12 20:01:15 -04:00
Neerti
7b84411b7c Fixes drinks and adds new one. 2019-03-08 20:19:14 -05:00
Neerti
765af99014 Merge pull request #5993 from Mechoid/Fix_A_Semicolon 
Fixes the greatest bug to affect our time.
 2019-03-08 20:19:01 -05:00
Neerti
e2557228dc Copy character slots 2019-03-08 20:17:46 -05:00
Atermonera
bf7686cd02 Merge pull request #5992 from mistyLuminescence/turtlenecks 
Departmental Turtlenecks
 2019-03-08 01:45:09 -05:00
Heroman3003
f5e7961f6b Allows putting bodies into resleeving pod via drag-and-drop 2019-03-07 09:17:32 +10:00
Neerti
627cdecf66 Subspace Jammer now blocks signalers, suit sensors, lasts longer 2019-03-04 22:58:41 -05:00