Commit Graph

18732 Commits

Author SHA1 Message Date
Letter N 6286d40082 code works 2021-02-12 17:26:08 +08:00
Dan-Neposh 7f0af72e8f splits the announcement message in half so that the subtitles line up 2021-02-12 03:53:31 -05:00
Vynzill 3d7e74ba66 less loot more danger
touches stuff up, removes gamer loot, buffs a frog and adds apes.
2021-02-11 23:44:54 -06:00
Letter N a2419f760a Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-12 13:18:09 +08:00
Letter N 92eb4fb684 filter 2021-02-12 12:40:24 +08:00
DeltaFire 1ea3aafa10 Merge pull request #14166 from Hatterhat/ebola-nerf
energy bola nerf - reduced breakout time (6 sec -> 2.5), deletes on remove
2021-02-12 05:06:48 +01:00
Letter N 3167dd8e22 atmos cc, cpl 2021-02-12 11:50:39 +08:00
Letter N 8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
DeltaFire 06101ee9c8 sigh 2021-02-12 03:30:15 +01:00
DeltaFire b0ff405a13 cool 2021-02-12 03:06:53 +01:00
DeltaFire fb4641b348 e 2021-02-12 02:42:59 +01:00
Lin 61877a3d1c Merge pull request #14223 from timothyteakettle/quieten-a-log
changes a migration error to use log_game instead of message_admins
2021-02-11 19:02:44 -06:00
DeltaFire 5afa573fa6 sigh
sigh
2021-02-12 00:50:42 +01:00
SandPoot b786dff6ef comma 2021-02-11 13:25:43 -03:00
SandPoot a0c92f0646 upload files 2021-02-11 13:22:37 -03:00
Adelphon 919e23c122 More Clothes 2021-02-11 02:36:50 -05:00
Hatterhat 3040eca4e0 holy shit what was i thinking god FUCK durathread 2021-02-11 00:20:49 -06:00
DeltaFire 7259f53160 Merge pull request #14206 from Citadel-Station-13/silicons-patch-10
Nerfs VoG stun, knockdown, vomit. Removes sleep command.
2021-02-11 04:32:37 +01:00
DeltaFire 7fbb41eee0 screaming 2021-02-11 04:12:42 +01:00
Timothy Teakettle d858c420aa Update preferences_savefile.dm 2021-02-10 23:18:53 +00:00
silicons c8cf061773 Merge pull request #14211 from timothyteakettle/better-logging
pickpocketing is now logged outside of hrefs
2021-02-10 02:09:50 -07:00
silicons 4b089f3514 Merge pull request #14202 from DeltaFire15/robo-vendor
Adds nanogel to the robodrobe
2021-02-10 02:09:29 -07:00
silicons 74a7c1e9fb Merge pull request #14203 from zeroisthebiggay/patch-4
makes the a.sterile mask no longer hide your face
2021-02-10 02:09:20 -07:00
silicons ca906eb683 Merge pull request #14208 from dzahlus/grenadelaunch.ogg
sound PR oversights fix
2021-02-10 02:07:57 -07:00
Letter N 834e4730b3 not existing 2021-02-09 15:44:49 +08:00
Adelphon 28d1f93b1c Clothing PR
I added two clothing that I made.
2021-02-09 00:41:11 -05:00
Timothy Teakettle e433c0b172 Update living.dm 2021-02-08 17:04:55 +00:00
Timothy Teakettle 3d97c1fb89 log fix 2021-02-08 17:00:26 +00:00
Timothy Teakettle b7e9169257 Update human.dm 2021-02-08 16:44:02 +00: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
Letter N f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
silicons b1ce9a9618 Update vocal_cords.dm 2021-02-08 03:09:19 -07:00
silicons 0895789217 Update vocal_cords.dm 2021-02-08 03:06:54 -07:00
silicons 2fdc52828b Merge pull request #14200 from TyrianTyrell/master
Update tongue.dm
2021-02-08 03:03:15 -07:00
silicons 70155a8fb2 Merge pull request #14194 from Chiirno/WaddlersRiseUp
Adds clown waddle to clown shoes.
2021-02-08 03:02:40 -07: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
zeroisthebiggay 0c0ff44c23 pog
pog
2021-02-07 22:01:57 -05:00
DeltaFire d482d387ee whoops 2021-02-07 18:24:18 +01:00
TyrianTyrell 7fff6a75c0 Update tongue.dm 2021-02-07 04:29:19 -05:00
silicons cf4a5f3388 Merge pull request #14189 from dzahlus/diversify-sound
Diversify weapon sound
2021-02-06 11:42:36 -07:00
silicons 86066450f3 Merge pull request #14179 from TyrianTyrell/master
Signed language (Requested changes complete)
2021-02-06 11:42:24 -07: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
Lin fe263ae2ff Merge pull request #13890 from silicons/parry
ablative parry armwraps
2021-02-05 23:52:18 -06:00
Fermi f236b2da29 Merge branch 'master' into Dispencer-UI-change 2021-02-06 02:40:27 +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
SmArtKar 18a82a242f CI 2021-02-05 12:20:18 +03:00
SmArtKar c9e97986c8 Patches, fixes, NUCLEAR CARDS 2021-02-05 12:13:38 +03: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 e58f170057 begrudgingly added ctrl+click to the examine info. 2021-02-04 19:37:34 -04:00