cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-21 11:46:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
792 Commits
Author SHA1 Message Date
BongaTheProto 2d1d665e41 Revert "Merge remote-tracking branch 'upstream/master'" 
This reverts commit c1c9fef224, reversing
changes made to 6767f48e82.
 2023-12-16 10:48:35 -05:00
BongaTheProto c1c9fef224 Merge remote-tracking branch 'upstream/master' 2023-12-15 18:12:47 -05:00
SandPoot c36105ef88 holy hell 2023-12-07 23:08:17 -03:00
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
BongaTheProto 620380e188 Merge remote-tracking branch 'upstream/master' 2023-01-21 13:15:29 -05:00
SandPootandGitHub c5987c6c79 More mining ror reskin (#290) 2023-01-21 13:52:00 -03:00
BongaTheProto d6aa3acbd4 Merge remote-tracking branch 'upstream/master' 2023-01-09 17:08:06 -05:00
SandPootandGitHub 2a772c8482 Adds the commando skin from ror & ror2 to the mining hardsuit (#280) 
* first commit with everything

* quick fix and little extra usage!

* the boy

* previous could break

* better head
 2023-01-09 18:55:07 -03:00
SandPoot f2a49bc319 first commit with everything 2023-01-08 21:36:57 -03:00
BongaTheProto e1cb9c8346 Merge remote-tracking branch 'upstream/master' 2022-09-27 23:19:10 -05:00
SandPoot f039efca97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-27 01:19:55 -03:00
shellspeed1 15006a5dfd Revert "adds gun safeties, remember to turn them off." 
This reverts commit 9ca985b769.
 2022-09-17 06:47:26 -07:00
shellspeed1 9ca985b769 adds gun safeties, remember to turn them off. 2022-09-16 19:24:21 -07:00
shellspeed1 91c095989a stuff 2022-09-16 17:55:10 -07:00
shellspeed1 bc13bdb177 sort of working fire selector, still need to get the safety stuff figured out and finish getting the selector working properly 2022-09-09 22:23:05 -07:00
shellspeed1 f2ed6a571c this gets it to the point it compiles 2022-09-09 18:04:52 -07:00
shellspeed1 fbc80cf829 initial port 2022-09-09 00:29:20 -07:00
BongaTheProto 3341812b44 Merge remote-tracking branch 'upstream/master' 2022-08-20 17:16:19 -05:00
SandPoot 550db1b6ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-20 17:27:19 -03:00
zerothebigboy 4c2fc18a0a cheesed to meet you 2022-08-10 11:13:58 -04:00
BongaTheProto 9e7c5033cc Merge remote-tracking branch 'upstream/master' 2022-08-07 21:42:16 -05:00
SandPoot 6108e1d522 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-07 19:46:26 -03:00
siliconsandGitHub 5846d5fbc1 Merge pull request #15751 from Hatterhat/vg-25163-try-2 
/vg/station style recoil - screen pushback
 2022-08-06 23:17:22 -07:00
BongaTheProtoandGitHub 74797a79be Merge branch 'Sandstorm-Station:master' into master 2022-08-05 23:15:43 -05:00
SandPoot bf0c0f530d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-05 19:09:18 -03:00
Hatterhat 959fa45d3c client prefs! per-gun recoil multipliers! 2022-08-05 16:00:19 -05:00
Hatterhat 2155a8bdce funny ammo 2022-08-03 06:11:04 -05:00
BongaTheProto 08db67f10a Merge remote-tracking branch 'upstream/master' 2022-07-09 10:53:45 -05:00
SandPoot 1b42f5f99f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-07-08 20:20:44 -03:00
SandPoot 33bfcf67b5 solves missing keyword args 2022-07-03 01:37:26 -03:00
SandPoot 09e351277a this 2022-07-03 01:28:39 -03:00
BongaTheProto 6d385f2b2e Merge remote-tracking branch 'upstream/master' 2022-06-07 19:10:13 -05:00
SandPoot be1357bdb0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-07 17:29:38 -03:00
deathride58 1a918ed8db animation refresh - huge unatomized bundle of fixes and tweaks to numerous animations in the game 2022-05-31 19:22:30 -04:00
BongaTheProto 6ada3f7c94 Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen 2022-04-18 21:36:14 -05:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
BongaTheProto a4fac709c3 Merge remote-tracking branch 'upstream/master' 2022-04-09 11:43:45 -05:00
SandPoot 2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
SandPoot 9df4ed8253 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:48:16 -03:00
SandPoot ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -03:00
LinandGitHub fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
radar651 076e12a829 Ready 
Ready for test merg
 2022-04-04 16:20:45 -05:00
radar651 ed4e9b45a3 Fixes 
Some presalt fixes
 2022-03-31 02:59:16 -05:00
Solaris-Shade a4f8789d68 DO it not HIT it! 
https://github.com/tgstation/tgstation/pull/65061
 2022-03-24 22:43:17 -04:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
Solaris-ShadeandGitHub 0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05:00
Solaris-Shade 171bd18c8a Updated Projectile code some more. 2022-03-11 22:23:01 -05:00
Solaris-Shade c5be81c589 tg moved projectiles out of /item, added '/item' back 2022-03-06 16:29:58 -05:00