Commit Graph

41219 Commits

Author SHA1 Message Date
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
CitadelStationBot b139723a52 Automatic changelog generation for PR #14200 [ci skip] 2021-02-08 04:03:18 -06:00
silicons 2fdc52828b Merge pull request #14200 from TyrianTyrell/master
Update tongue.dm
2021-02-08 03:03:15 -07:00
CitadelStationBot 2791e9ad83 Automatic changelog generation for PR #14199 [ci skip] 2021-02-08 04:03:02 -06:00
silicons 45fecf2b4e Merge pull request #14199 from MrJWhit/boxstation-dorms-fix
Boxstation disposals update
2021-02-08 03:02:58 -07:00
CitadelStationBot e1e9c1d628 Automatic changelog generation for PR #14194 [ci skip] 2021-02-08 04:02:43 -06:00
silicons 70155a8fb2 Merge pull request #14194 from Chiirno/WaddlersRiseUp
Adds clown waddle to clown shoes.
2021-02-08 03:02:40 -07:00
CitadelStationBot 6563980c7e Automatic changelog generation for PR #14196 [ci skip] 2021-02-08 04:02:34 -06:00
silicons a3187e8216 Merge pull request #14196 from timothyteakettle/sentient-virus
sentient viruses can now infect synths and ipcs (fastest salt in the west)
2021-02-08 03:02:31 -07:00
TyrianTyrell 7fff6a75c0 Update tongue.dm 2021-02-07 04:29:19 -05:00
Changelogs 936abbd9f0 Automatic changelog compile [ci skip] 2021-02-07 00:13:52 +00:00
MrJWhit c7f6c037f5 Boxstation disposals update 2021-02-06 16:31:30 -05:00
CitadelStationBot 1dd9ec4fd0 Automatic changelog generation for PR #14189 [ci skip] 2021-02-06 12:42:39 -06:00
silicons cf4a5f3388 Merge pull request #14189 from dzahlus/diversify-sound
Diversify weapon sound
2021-02-06 11:42:36 -07:00
CitadelStationBot 874de99056 Automatic changelog generation for PR #14179 [ci skip] 2021-02-06 12:42:27 -06:00
silicons 86066450f3 Merge pull request #14179 from TyrianTyrell/master
Signed language (Requested changes complete)
2021-02-06 11:42:24 -07:00
CitadelStationBot 2d4e0c6b5b Automatic changelog generation for PR #13966 [ci skip] 2021-02-06 12:41:12 -06:00
silicons 08356ee7f7 Merge pull request #13966 from Thalpy/Dispencer-UI-change
[Ready] Fixes and tweaks for the chemistry machine suite
2021-02-06 11:41:08 -07:00
deathride58 2ebbef4a63 Merge pull request #14197 from timothyteakettle/sanitize-your-text
[s] sanitize your text
2021-02-06 13:02:16 -05:00
timothyteakettle a9170aae93 Update priority_announce.dm 2021-02-06 17:42:37 +00:00
CitadelStationBot c95896b473 Automatic changelog generation for PR #13890 [ci skip] 2021-02-05 23:52:20 -06:00
Lin fe263ae2ff Merge pull request #13890 from silicons/parry
ablative parry armwraps
2021-02-05 23:52:18 -06:00
Fermi bd959877a5 Updates tgui 2021-02-06 02:46:11 +00:00
Fermi f236b2da29 Merge branch 'master' into Dispencer-UI-change 2021-02-06 02:40:27 +00:00
Fermi 1498130072 Merge remote-tracking branch 'upstream/master' 2021-02-06 01:17:41 +00:00
Timothy Teakettle 4b51174717 Update disease_disease.dm 2021-02-05 16:43:18 +00:00
DeltaFire bbcf23fae9 Merge pull request #14182 from Citadel-Station-13/silicons-patch-8
i hate xenobiology players
2021-02-05 16:09:58 +01:00
dzahlus 2322652d48 haha oops forgotthis existed 2021-02-05 13:04:11 +01:00
silicons 3f4aff09d1 Update code/modules/research/xenobiology/crossbreeding/_status_effects.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-02-05 00:59:19 -07:00
Chiirno 161f1bae4b changelog please 2021-02-04 23:42:43 -04:00
Chiirno ec8b154495 just gonna replace the whole darn thing 2021-02-04 20:27:44 -04:00
Changelogs 02e9ce07c2 Automatic changelog compile [ci skip] 2021-02-05 00:13:56 +00:00
Chiirno 36635a7d23 Update changelog.html 2021-02-04 20:13:51 -04:00
Chiirno 6b5dba7473 Merge branch 'WaddlersRiseUp' of https://github.com/Chiirno/Citadel-Station-13 into WaddlersRiseUp 2021-02-04 20:11:07 -04:00
Chiirno da7f6cfb51 nevermind 2021-02-04 20:11:01 -04:00
Chiirno 1c8b6e7842 Now it is pristine 2021-02-04 20:06:17 -04:00
Chiirno 02c6f94fb3 why was the changelog changed 2021-02-04 20:04:39 -04:00
Chiirno e58f170057 begrudgingly added ctrl+click to the examine info. 2021-02-04 19:37:34 -04:00
Chiirno c85e381169 Waddlers rise upgit add * 2021-02-04 18:25:37 -04:00
CitadelStationBot 27b0e3264b Automatic changelog generation for PR #14159 [ci skip] 2021-02-04 16:04:12 -06:00
DeltaFire df3f4a7ca6 Merge pull request #14159 from raspy-on-osu/ventcrawling-refactor-fix2
Fixes Alien Royals being able to ventcrawl
2021-02-04 23:04:09 +01:00
Changelogs 398d8cc9c4 Automatic changelog compile [ci skip] 2021-02-04 17:54:03 -04:00
Chiirno 3ae79ce433 yesss? 2021-02-04 17:52:53 -04:00
raspy-on-osu a7dd74201c 2 2021-02-04 16:51:06 -05:00
Changelogs dd540c29fb Automatic changelog compile [ci skip] 2021-02-04 17:47:49 -04:00
raspy-on-osu 3a3b3966a1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ventcrawling-refactor-fix2 2021-02-04 16:46:37 -05:00
Chiirno b292726a64 I think this will correct the merge 2021-02-04 17:31:09 -04:00
DeltaFire d364fdbc6d Merge pull request #14193 from Citadel-Station-13/silicons-patch-9
sanitizes id cards
2021-02-04 21:26:50 +01:00
silicons 89c63a243f Update card.dm 2021-02-04 13:23:03 -07:00
TyrianTyrell d1b7b191d2 Update preferences_savefile.dm 2021-02-04 15:14:20 -05:00