cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-30 03:05:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,946 Commits 9 Branches 0 Tags
fab4ecff1d56bc34b6a71ba767fa943ebbc8f8ab
Commit Graph

8353 Commits

Author SHA1 Message Date
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
b4db45e1ea Merge pull request #5997 from mistyLuminescence/plantbeakers 
Beakers for Botany
 2019-03-26 17:17:01 -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
Anewbe
b84f216b87 Merge pull request #5996 from Heroman3003/master 
Fixed construction of fulltile electrochromic windows
 2019-03-12 19:59:57 -04:00
Atermonera
bf7686cd02 Merge pull request #5992 from mistyLuminescence/turtlenecks 
Departmental Turtlenecks
 2019-03-08 01:45:09 -05:00
Neerti
627cdecf66 Subspace Jammer now blocks signalers, suit sensors, lasts longer 2019-03-04 22:58:41 -05: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
Neerti
6de658bf0d Merge pull request #5981 from Heroman3003/handtele-fix-fix 
Handtele no longer relies on teleporter being mapped in in very specific way
 2019-02-28 22:30:17 -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
Neerti
a0c757cd05 Adds a new Shroud design 2019-02-18 03:52:22 -05: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
Anewbe
693b444fd1 Merge pull request #5935 from TheFurryFeline/patch-1 
Nerfs Sonic Speed Wheelchair
 2019-02-10 18:34:18 -05: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
Neerti
f7df9d021b Mechs can travel to the mines again 2019-01-30 00:21:54 -05:00
Atermonera
439afee2ab Unclogs powersink drains 2019-01-26 17:54:34 -05:00
Hawk_v3
e42c386d7e Merge remote-tracking branch 'upstream/master' 2019-01-22 21:58:25 +00: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
Anewbe
8e9e83fde0 Merge pull request #5858 from Atermonera/suitcooler_pressurization 
Suit coolers don't overheat in vacuum
 2019-01-18 09:15:04 -05:00
Hawk_v3
2bc1f83de7 Merge remote-tracking branch 'upstream/master' 2019-01-15 20:56:39 +00:00
Anewbe
1ea5885504 Merge pull request #5825 from PolarisSS13/butt_boxing 
Adds ability to put butts in boxes
 2019-01-14 21:23:41 -05:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Neerti
e1cf31c565 Merge pull request #5835 from Cerebulon/ReligionUpdate 
Updates Religion Lists + Adds Religious Paraphernalia
 2019-01-14 03:47:00 -05:00
Cameron653
9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05:00
Neerti
58ca3dd469 Merge pull request #5824 from Heroman3003/paint_bucket_fix 
Fixes non-black/white paint buckets not actually having paint in them
 2019-01-12 04:23:21 -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