Commit Graph

1401 Commits

Author SHA1 Message Date
SandPoot
159f883e52 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-11 11:35:58 -03:00
keronshb
41530110a2 LINTER
AHHHH NEW LINE
2021-02-10 20:00:17 -05:00
dzahlus
6dabe348fa fixes oversights
fixes grenadelauncher.ogg being used where it shouldnt FOR GOOD NOW I SWEAR. Bokken sound fixed, mech weapons now use proper sound too
2021-02-08 14:43:33 +01:00
SandPoot
3aa7554135 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-06 20:36:07 -03:00
dzahlus
c896d50e56 get hardscoped
new weapon sounds for the sniper rifle and the AT pistol
2021-02-03 22:29:08 +01:00
dzahlus
6da6c0749c gunshotshotgunshot.ogg
Yeah I use the gunshotshotgunshot you know why? Also fixes firing_sound erro to fire_sound on surplus rifle
2021-02-03 22:14:27 +01:00
dzahlus
2ffe5dda10 RIFLEMAN 300m FRONT
BRO WHERE I CANT FUCKING SEE SHIT FUCKING TERMINATOR AI. Adds unique rifle sounds for AR, M90 and Mosin.
2021-02-03 21:35:49 +01:00
dzahlus
33b3122bd4 LMG MOUNTED AND LOADED
new L6 SAW sounds
2021-02-03 21:14:01 +01:00
dzahlus
46a170b1c5 my ammunition finally feels depleted again
machine gun sound diversification, also "ammunition depleted" for WT550 as it's the NT counterpart to the C20r.
2021-02-03 20:04:17 +01:00
dzahlus
364d1a3239 you're pretty good
But let me show you why they call me, Revolver.
2021-02-03 18:49:49 +01:00
keronshb
26dfff87fc Slight stat buffs, adds parries and comments
Should be pretty close to 20tc worthy.
2021-01-29 13:17:46 -05:00
keronshb
4346cb937a Fixes merge conflict and makes minor adjustments
TItle
2021-01-29 09:32:28 -05:00
keronshb
a4e933185e Merge remote-tracking branch 'origin/master' into motivation 2021-01-29 09:29:55 -05:00
keronshb
a6725b3c23 Motivation near final
Should be almost done after this.
2021-01-28 22:06:25 -05:00
keronshb
a2833ea85f Movitation WIP
WIP still working on this
2021-01-26 13:27:06 -05:00
SandPoot
60e78f4ac7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-26 12:27:08 -03:00
silicons
a1e92e55aa Merge pull request #14102 from Hatterhat/somatobuff-50513
[READY] somatoray buff - mutation locks + revolution ray
2021-01-25 23:17:29 -07:00
SandPoot
8582f93800 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-20 19:14:59 -03:00
Letter N
021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
SandPoot
0d1a6c73fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-19 23:31:15 -03:00
Hatterhat
e006587f4b today i will not test my code 2021-01-19 17:24:33 -06:00
SandPoot
c15a3b7a4e changes some comments and var paths to be better? 2021-01-19 13:01:45 -03:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
SandPoot
44acce82ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-19 00:10:54 -03:00
silicons
0229078b58 Update foam_dart.dm 2021-01-18 02:32:21 -07:00
silicons
af524f4a07 Merge pull request #14029 from HeroWithYay/Sci_Guns_Fix
Ports TG code for wormhole projector and gravity gun.
2021-01-17 20:41:20 -07:00
SandPoot
67ad6cbbb8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-15 19:03:13 -03:00
The0bserver
1b469bdfda The power of overwriting... 2021-01-14 01:03:48 -05:00
The0bserver
55cd69746d A change in tact, perhaps? 2021-01-13 23:08:05 -05:00
The0bserver
2b8b9086ec Revert "Initial Commit:Goodbye rifle! You won't be missed!"
This reverts commit 1836d0106a.
2021-01-13 22:14:36 -05:00
The0bserver
1836d0106a Initial Commit:Goodbye rifle! You won't be missed! 2021-01-13 21:42:08 -05:00
HeroWithYay
f8870c7c5d Fixed another error in the examine text. 2021-01-12 08:16:10 +13:00
HeroWithYay
f4c5fa9b7c Fixed an error in the examine text. 2021-01-12 08:15:20 +13:00
HeroWithYay
2c8b83bcaa Wormhole Projector and Gravity Gun now use anomaly cores instead of firing pins. 2021-01-12 08:03:15 +13:00
silicons
bffc43e95e fixes 2021-01-08 18:59:26 -08:00
silicons
849e9405fd projectile fix 2021-01-08 18:53:49 -08:00
silicons
bd3761d39e proper smooth movement 2021-01-08 10:51:48 -08:00
SandPoot
acad841ef4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-28 13:32:08 -03:00
Letter N
1095142a5f Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-26 10:58:12 +08:00
silicons
879ea9c6c8 ok 2020-12-25 14:23:16 -08:00
Letter N
56fb81d02c Immursive Audio 2 2020-12-24 11:06:49 +08:00
SandPoot
b96312ef86 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-19 01:35:44 -03:00
DeltaFire
1e8e1ec72b Merge pull request #13786 from kiwedespars/why
x-ray laser nerfs
2020-12-19 05:28:43 +01:00
kiwedespars
9b710f5553 Update beams.dm 2020-12-18 15:53:11 -08:00
kiwedespars
98c3335dce doubles xray laser cost, 20 -> 10 shots 2020-12-15 21:04:10 -08:00
kiwedespars
a95ba25d17 Update beams.dm
25 -> 75 rad
15 -> 20 damage
2020-12-15 21:02:46 -08:00
kiwedespars
92c70b8089 Update beams.dm 2020-12-14 19:46:28 -08:00
SandPoot
af0f6e7bd0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-18 23:12:54 -03:00
silicons
5b03f5b0ec more 2020-11-12 23:36:18 -07:00
SandPoot
b77a18d6c5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-07 13:03:03 -03:00