cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 12:50:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,601 Commits 9 Branches 26 Tags
efdb175d527df19a0b5bdbbb37e0433824ddbb73
Commit Graph

7781 Commits

Author SHA1 Message Date
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
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
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
Novacat
696872690e Merge pull request #4677 from VOREStation/upstream-merge-5776 
[MIRROR] Adds pressure protection bounds to clothing.
 2019-03-27 15:18:17 -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
Novacat
823354433e Merge pull request #4659 from VOREStation/upstream-merge-5796 
[MIRROR] Adds New PoI Features + Bonus PoI
 2019-03-27 13:52:46 -04:00
Neerti
9d46150515 Adds pressure protection bounds to clothing. 2019-03-27 13:26:07 -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
Neerti
91a5203e32 Adds New PoI Features + Bonus PoI 2019-03-27 12:15:50 -04:00
Novacat
9e00a1b164 Merge pull request #4641 from VOREStation/upstream-merge-5808 
[MIRROR] CODERS HATE HIM: THIS TOTAL LOSER FIXES TYPOS
 2019-03-27 11:22:21 -04:00
Spades
eb0e2ec1f5 Guns sounds refactor and improvements 2019-03-27 10:42:18 -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
7a13562736 Merge pull request #4620 from VOREStation/upstream-merge-5779 
[MIRROR] Emergency tanks start full
 2019-03-27 03:40:45 -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
Novacat
2f3edf4a72 Merge pull request #4612 from VOREStation/upstream-merge-5770 
[MIRROR] Standardizes rotation verbs
 2019-03-27 03:40:04 -04:00
Unknown
0c391cc252 Conflict Resolution 2019-03-27 03:22:15 -04:00
Neerti
b9adc37685 Standardizes rotation verbs 2019-03-27 03:17:07 -04:00
Atermonera
831ce7475e Merge pull request #5792 from Neerti/christmas_stuff 
Ports the lightpost and present tree from tg.
 2019-03-27 03:13:15 -04:00
Neerti
585b688709 Adds Identification System, New Autoinjectors 2019-03-27 02:25:55 -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
Spades
4320afc530 Merge branch 'master' into upstream-merge-5757 2019-03-02 08:05:51 -05:00
Unknown
85be5a9166 [5654] Resolves Merge Error 
"But I wanted to play Hearts of Iron..."
"NO."
 2019-03-01 23:58:05 -05:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Spades
71d1a05531 Merge pull request #4543 from VOREStation/upstream-merge-5747 
[MIRROR] Makes fulltile windows seperate from dir
 2019-02-25 08:57:19 -05:00
Unknown
a4317b1910 [5654] Makes this PR Compile 
This one made me cry.
 2019-02-23 12:30:16 -05:00
Sebbe9123
420803122b re-fixes this file since it wasn't obvious I was a brainlet before. 2019-02-20 23:50:07 +01:00
Sebbe9123
d329ad5fe8 Re-adds mouse because someone lazy comment. 2019-02-18 10:55:57 +01:00
Sebbe9123
b6b4980ea8 Fixes largecrates for real, i'm a fucking brainlet. 2019-02-18 10:46:07 +01:00
Sebbe9123
c0e0afe919 Fixes most crates in largecrave_vr. Oties still broke. 2019-02-18 10:25:28 +01:00
Sebbe9123
bd89126955 Fixes random_vr except oties 2019-02-18 09:08:36 +01:00
Sebbe9123
5b163c44a8 Updates Mob_spawner_vr to new paths. 
All the old paths have updated new ones besides the broken Otie.
 2019-02-18 08:50:53 +01:00
Poojawa
8d178972a1 ports #4581 Startup Runtime fix 2019-02-02 06:03:40 -06:00
Poojawa
6f2548e47b Merge remote-tracking branch 'refs/remotes/origin/master' into upstream/upstream-merge-5735 2019-02-02 03:55:21 -06:00
Spades
30ab44613d Merge pull request #4540 from VOREStation/upstream-merge-5714 
[MIRROR] Borg, Gripper, and Integrated Circuit interaction update.
 2019-01-21 11:42:38 -05:00
Anewbe
3d557f93d0 Fixes candle sprites 2019-01-18 15:46:55 -05:00