Commit Graph

1160 Commits

Author SHA1 Message Date
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
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
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
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
Letter N 021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
Hatterhat e006587f4b today i will not test my code 2021-01-19 17:24:33 -06:00
silicons dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07: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
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
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
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
silicons 5b03f5b0ec more 2020-11-12 23:36:18 -07:00
Trilby 3307711f08 suppression 2020-10-28 13:00:02 -04:00
kappa-sama b3fc60c3f5 this too 2020-10-20 19:44:10 -04:00
DeltaFire a5fce4b6ed Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2 2020-10-11 15:39:41 +02:00
BlackMajor 9e909095a8 Merge pull request #13015 from silicons/combat_rework_experimental
Combat v4: Redesigning Stamina, Sprint, Combat mode
2020-10-11 18:38:53 +13:00
silicons 7f611a98e1 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-10 22:23:22 -07:00
DeltaFire 4ccf40f775 Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
This reverts commit 27a099c6bf.
2020-10-11 00:53:18 +02:00
DeltaFire 27a099c6bf Revert "Merge branch 'master' into robotic-limbs-PT2"
This reverts commit 73b5267425, reversing
changes made to 2e780bfff2.
2020-10-11 00:51:39 +02:00
DeltaFire 73b5267425 Merge branch 'master' into robotic-limbs-PT2 2020-10-11 00:44:28 +02:00
DeltaFire 9990337f32 fixes a bunch of portal runtimes
Ah yes lets just change the basic portal generation proc but not change the actual calls to it for the most part, what could go wrong?!
2020-10-10 23:40:12 +02:00
silicons 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 1b1efce556 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-06 17:11:21 -07:00
silicons 8eac1cb939 Merge pull request #13511 from Hatterhat/hakitavolver
additional revolver sprites
2020-10-06 16:51:18 -07:00
Hatterhat 5a517be5e7 thanks toriate 2020-10-06 12:47:00 -05:00
DeltaFire 4146566af0 hoo boy
replaces all mentions of bodypart_robotic with is_robotic_limb() where possible, adds BODYPART_HYBRID, adds helpers for organic / robotic limbs (is_robotic_limb() / is_organic_limb(), with a arg to override it accepting hybrid limbs)
Also makes the the surgery to heal robotic limbs work if the torso isn't a robot, but rather if there are robotic bodyparts, makes the IPC brain repair.. only accept IPC brains (obviously), makes the damage threshholds for robo-limbs vars instead of a fix 25 with hybrid ones predefined at 25 / 15 (trigger / mindamage), adds an error message to fixing them if already at theshhold, etc. Now just for replacing BODYPART_ORGANIC with is_organic_limb aswell where applicable.. also actual values for the other robo limbs. Fun!
2020-10-06 17:34:13 +02:00
Hatterhat 2e7101fdc5 funny revolver sprites - squashed 2020-10-05 22:56:52 -05:00