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
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
SpookyTheFox
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
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
Lin
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
SpookyTheFox
bc0c929104
added a magazine name
...
hopefully fixes this, I don't like seeing null ref exceptions
2022-08-19 15:39:17 -07: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
silicons
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
BongaTheProto
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
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
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
JessieProudmore
6d7f86416d
Stun/less-lethal fix
...
Tweaks to some projectiles and taser electrodes
2022-05-07 20:09:31 +02:00
Toxici11i
d836bcf147
Fixes bug with super-expensive shotgun
2022-05-06 20:43:02 +01: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
Col.Rice
94f0abed81
Update revolver.dm
2022-04-13 23:27:46 +07:00
Col.Rice
db9708f1c4
Update revolver.dm
2022-04-13 21:05:37 +07: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
Lin
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
radar651
f816373439
Ready for merg
...
At least I hope so
2022-03-26 05:21:06 -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
SandPoot
a8f454bd72
Upload files
2022-03-16 14:00:31 -03:00
Solaris-Shade
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
