Commit Graph
171 Commits
Author SHA1 Message Date
BongaTheProto e3d1286cb8 Merge remote-tracking branch 'upstream/master' 2023-11-23 17:23:16 -05:00
5dc2241d6a Syndicate Skinned Box Station (#15580)
* Syndicate Skinned Box Station

* Create syndicatestation.json

Okay tHIS FIXED IT I THINK HOLY CRAP THIS WAS AN EXPERIENCE.  HERES THE JSON!

* actually makes this work

* random runtime

we lvoe lesser-used items with runtiming actions

---------

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2023-11-13 12:48:38 +01:00
LagardereMathis 0c4fbe0914 Add diagonal bayonet and adds it to hunting rifle 2023-09-13 22:06:44 +02:00
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 2490e5b5fd Kaiju event-only gun 2023-06-06 09:23:54 -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 1ebc2e584b makes weapons unsafe 2022-09-17 06:53:46 -07:00
shellspeed1 64ce476764 removes admin messaging 2022-09-16 19:28:56 -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
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
LinandGitHub 257d377192 this is really stupid (#15801) 2022-08-21 20:38:47 -07:00
Hatterhat 959fa45d3c client prefs! per-gun recoil multipliers! 2022-08-05 16:00:19 -05:00
Hatterhat 2d405f7bc8 nitpicky todo 2022-08-03 06:29:22 -05:00
Hatterhat 670bda0e29 it works 2022-08-03 06:01:35 -05:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
Linzolle c2378d3f26 helmet stuff 2021-11-29 17:40:08 -07:00
Linzolle 9807a2f9e0 pin removal and gun examine things 2021-11-29 17:22:13 -07:00
Putnam 9040c08698 whoops i forgot the var 2021-05-30 00:38:07 -07:00
Putnam 2ab05d1247 makes sniper zooming work 2021-05-30 00:31:20 -07:00
SandPoot 123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot cf2e70671a upload files 2021-02-18 14:47:10 -03:00
silicons bd3761d39e proper smooth movement 2021-01-08 10:51:48 -08:00
Letter N 56fb81d02c Immursive Audio 2 2020-12-24 11:06:49 +08:00
silicons 7f611a98e1 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-10 22:23:22 -07:00
19f1e99a8c mass ports like 15 tg prs + counting (#13386)
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2020-10-10 12:20:33 +02:00
silicons 1ea0dd9f76 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-19 15:56:13 -07:00
Ghommie fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
siliconsandGitHub a8d61b60ef Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch
adds a cybernetic eyepatch to the syndicate uplink
2020-08-11 01:47:32 -07:00
silicons 0a36f9fbb5 changes 2020-08-04 22:40:28 -07:00
Timothy Teakettle 91664f5064 bracket 2020-08-03 22:17:35 +01:00
Timothy Teakettle 3a0b34fb1b funny aim go brr 2020-08-03 21:58:58 +01:00
Timothy Teakettle 8a3e69d32f no more inaccuracy 2020-08-03 21:40:10 +01:00
silicons 42db990836 why am i doing this 2020-08-03 13:37:37 -07:00
Timothy TeakettleandGitHub 9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
LinandGitHub bbffd41d55 Merge pull request #12883 from Citadel-Station-13/silicons-patch-49
beam rifles are now practical in emitters
2020-07-28 22:05:39 -05:00
LinandGitHub 81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
LinandGitHub 87eac49bbf Merge pull request #12862 from Citadel-Station-13/silicons-patch-44
you can now shoot yourself with a gun by using disarm intent will this cause balance issues maybe do i care not really
2020-07-27 11:46:37 -05:00
silicons 2a29f73ac8 ok 2020-07-25 17:34:12 -07:00
timothyteakettle 8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
silicons f47a7449e3 Update gun.dm 2020-07-23 18:52:23 -07:00
silicons ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00