Commit Graph
1404 Commits
Author SHA1 Message Date
SandPoot 9e8a510ed5 chapter 2: allow right click on action buttons 2023-08-26 21:37:06 -03:00
SandPoot 7038059ab5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-05-06 10:47:06 -03:00
KrissKr0ss 66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
2023-05-01 00:16:20 -05:00
SandPootandGitHub c5987c6c79 More mining ror reskin (#290) 2023-01-21 13:52:00 -03:00
Timothy TeakettleandGitHub c8fc27fc9c Merge pull request #15930 from SandPoot/reskinning
Update to reskinning
2023-01-11 01:00:35 +00: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 d743096f8a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-09 17:50:19 -03:00
SandPoot f2a49bc319 first commit with everything 2023-01-08 21:36:57 -03:00
Jerry WesterandGitHub ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
SandPoot 82eff346c7 Merge Upstream 2023-01-07 22:52:22 -03:00
siliconsandGitHub 23327fa268 Merge pull request #15894 from JerryWester/modsuits
MODsuits
2023-01-07 14:07:28 -08:00
Jerry Wester 642d24e8e1 tether module 2022-12-17 16:54:20 -07:00
SandPoot 011dd2e817 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-16 16:47:19 -03:00
LinandGitHub 7d0c3df2ad Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
dullahans 2: electric boogaloo
2022-12-14 19:07:59 -07: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 1ebc2e584b makes weapons unsafe 2022-09-17 06:53:46 -07: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 64ce476764 removes admin messaging 2022-09-16 19:28:56 -07:00
shellspeed1 9ca985b769 adds gun safeties, remember to turn them off. 2022-09-16 19:24:21 -07:00
shellspeed1 29d16e5f30 fixes weapon safety and fire selector button. 2022-09-16 19:24:06 -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
SandPoot 32535e69b6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-23 18:31:23 -03:00
LinandGitHub 257d377192 this is really stupid (#15801) 2022-08-21 20:38:47 -07:00
SandPoot 550db1b6ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-20 17:27:19 -03:00
timothyteakettle 2313a24918 Merge branch 'master' into dullahan-2-electric-boogaloo 2022-08-11 14:43:48 +01:00
zerothebigboy 4c2fc18a0a cheesed to meet you 2022-08-10 11:13:58 -04: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
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
Timothy Teakettle b4330b2f3d GOODBYE SPECIES, HELLO COMPONENT 2022-08-05 18:19:22 +01:00
Hatterhat 2d405f7bc8 nitpicky todo 2022-08-03 06:29:22 -05:00
Hatterhat 2155a8bdce funny ammo 2022-08-03 06:11:04 -05:00
Hatterhat 670bda0e29 it works 2022-08-03 06:01:35 -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
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
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03: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
Solaris-Shade a4f8789d68 DO it not HIT it!
https://github.com/tgstation/tgstation/pull/65061
2022-03-24 22:43:17 -04:00