cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-02 20:30:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,447 Commits 8 Branches 26 Tags
b91b10aaa59ddd63ed4d4bb79bfecbffb7977b99
Commit Graph

7755 Commits

Author SHA1 Message Date
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
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
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Cameron653
9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05:00
Anewbe
7642ce76fa Merge pull request #5808 from Ragolution/master 
CODERS HATE HIM: THIS TOTAL LOSER FIXES TYPOS
 2019-01-06 13:15:13 -05:00
Spades
1338225afa Resolves some merge conflicts 2019-01-05 16:29:19 -05:00
Spades
1b6f074890 Merge pull request #4622 from Novacat/nova-pathfinder 
Adds an Admin Subspace Jammer for events
 2019-01-05 00:04:57 -05:00
Spades
8c1b8aacb2 Merge pull request #4550 from Zap-zapper/size-im 
Size control implant
 2019-01-04 23:59:17 -05:00
Unknown
05b876aa3a Adds an Admin Subspace Jammer for events 
I plan on doing a stationary version down the road but that will require a lot more work.
 2018-12-31 09:13:39 -05:00
Atermonera
565ca393d8 Merge pull request #5779 from Novacat/spriteadd 
Emergency tanks start full
 2018-12-30 17:08:38 -05:00
Anewbe
a497071bac Standardises SifGov to VirGov 2018-12-28 18:56:15 -05:00
Spades
98e542144b Merge pull request #4524 from VOREStation/upstream-merge-5715 
[MIRROR] Updates Rapid Service Fabricators.
 2018-12-12 21:25:02 -05:00
Spades
e956afedbf Merge pull request #4529 from VOREStation/upstream-merge-5649 
[MIRROR] ᵗᵉᵉⁿʸ ᶠˡᵃˢʰˡᶦᵍʰᵗ ᵗʷᵉᵃᵏ
 2018-12-12 21:24:38 -05:00
Spades
8c3c8c45c9 Merge pull request #4549 from Verkister/implantshuds 
Fixes some implant related issues.
 2018-12-12 21:19:41 -05:00
Zap-zapper
e7ae902098 Moving code from normal files to lewd files 2018-12-09 09:47:07 +07:00
Spades
9b92dc1836 Merge pull request #4462 from Novacat/nova-basicfixes 
Expedition Job and Gear tweaks
 2018-12-08 09:44:15 -05:00
Spades
8518897faa Merge pull request #4461 from Novacat/nova-heterochromia 
Adds Subspace Radio
 2018-12-08 09:43:34 -05:00
Zap-zapper
3b2258ce38 size control implant 2018-12-08 17:12:33 +07:00
Neerti
60f88039ea Adds several new map/event oriented objects 2018-12-07 18:49:01 -05:00
kevinz000
fc178c1e04 Makes math helpers defines for performance 2018-12-06 16:15:00 -05:00
Verkister
c1536879b2 Fixes some implant related issues. 
-Fixes reagent implants being utterly bricked.
-Fixes backup implants not showing up in AR huds.
-Both issues were caused by implants now going way deeper into the bodyparts than before.
 2018-12-05 17:47:19 +02:00
Spades
e9b0432420 Merge pull request #4506 from Novacat/nova-survival 
Adds Prybars to Survival Boxes
 2018-12-04 20:21:05 -05:00
Anewbe
2572f3a145 Merge pull request #5747 from Neerti/fulltile_window_improvements 
Makes fulltile windows seperate from dir
 2018-12-04 14:37:19 -05:00
Atermonera
0a77d0d70d Borg, Gripper, and Integrated Circuit interaction update. 2018-12-03 20:22:47 -05:00