Commit Graph
1433 Commits
Author SHA1 Message Date
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
Vhariik af48763bb8 Update gun.dm 2023-06-12 14:57:02 -03:00
Vhariik f90766d361 Kaiju pin is now modular, hell yeah 2023-06-12 14:49:58 -03:00
Vhariik 2490e5b5fd Kaiju event-only gun 2023-06-06 09:23:54 -03:00
BongaTheProto 5116acad15 Merge remote-tracking branch 'upstream/master' 2023-05-06 18:31:55 -05: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
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
Timothy TeakettleandGitHub c8fc27fc9c Merge pull request #15930 from SandPoot/reskinning
Update to reskinning
2023-01-11 01:00:35 +00: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 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
BongaTheProto a04476b38d Merge remote-tracking branch 'upstream/master' 2022-12-16 20:39:53 -05: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
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 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
Zirok ecf847d67b remove a stray debug log that accidently made it into the previous commit 2022-09-16 11:13:15 +02:00
Zirok 98b1af6d1e Fix gun scopes
These were both runtiming upon being spawned(due to the nonsensical IsAvailable). Fixing that revealed that they're still not working, which was due to zoom() being called twice, first in ui_action_click(inovked by the parent call at the start of Trigger()) and then again in Trigger(). The first call zooms in, the second zooms out immediately afterwards.
2022-09-16 11:12:17 +02:00
SpookyTheFoxandGitHub c68b33aaad updated to TG
this was fixed a while back, things that destroy walls should also break windows
2022-09-12 22:37:07 -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 fb66dc2035 Merge remote-tracking branch 'upstream/master' 2022-08-23 20:30:19 -05: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
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
SpookyTheFoxandGitHub bc0c929104 added a magazine name
hopefully fixes this, I don't like seeing null ref exceptions
2022-08-19 15:39:17 -07: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
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
Timothy Teakettle b4330b2f3d GOODBYE SPECIES, HELLO COMPONENT 2022-08-05 18:19:22 +01:00