Commit Graph

27004 Commits

Author SHA1 Message Date
Lin
62fe42513b Merge pull request #14096 from Citadel-Station-13/silicons-patch-27
makes people on the ground punch less hard. completely removes punch rng miss.
2021-02-13 23:30:00 -06:00
Lin
b42ca71b00 Merge branch 'master' into virus_logging 2021-02-13 21:20:09 -06:00
Lin
32770ed0d3 Merge pull request #14241 from silicons/logging
fixes href logging prefiltering of chat pings, removes extraneous newlines from verbose tgui logging
2021-02-13 21:17:37 -06:00
silicons
61ab2a5a53 logging fixes 2021-02-13 19:47:17 -07:00
silicons
0aea43afcc Merge pull request #14224 from DeltaFire15/no-more-YELLING
Makes clockies yell less
2021-02-13 19:06:57 -07:00
silicons
5990a3ad4b Merge pull request #14227 from Adelphon/polycloth
CLOAK, PARKA, COLORFUL SHOES
2021-02-13 19:06:46 -07:00
silicons
aeb9b1e06c Merge pull request #14233 from DeltaFire15/armwrap-kneecap
About unarmed parrying..
2021-02-13 19:06:39 -07:00
silicons
3b441bfd28 kay 2021-02-13 19:03:27 -07:00
silicons
77f4e08727 AAAAAAAAA 2021-02-13 18:57:30 -07:00
Lin
98736a7a37 Merge pull request #14207 from TyrianTyrell/master
Multilingual fix? (Has since been tested.)
2021-02-13 16:41:10 -06:00
silicons
731c368ba7 Merge pull request #14231 from DeltaFire15/sigh
sigh
2021-02-12 19:00:14 -07:00
silicons
ae55071fe8 Merge pull request #14232 from DeltaFire15/better-be-named
Fixes & Improves some antagpanel stuff
2021-02-12 19:00:07 -07:00
silicons
76837ee0b6 Merge pull request #14225 from Hatterhat/dth-kit-pass2
[hello if someone could fight the maintainers to take a look that'd be great] fixes durathread armor kits
2021-02-12 18:54:36 -07:00
TyrianTyrell
a4bb96f614 Update good.dm 2021-02-12 07:02:14 -05: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
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
Hatterhat
7ec692ef60 this is good...isn't it? 2021-02-11 19:08:29 -06: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
Adelphon
919e23c122 More Clothes 2021-02-11 02:36:50 -05:00
Hatterhat
8103078ff1 second pass pt2 2021-02-11 00:29:25 -06: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
TyrianTyrell
5769cc106b Update good.dm 2021-02-10 13:56:56 -05: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
f0f9a865e6 Merge pull request #14204 from keronshb/powersinkobj-removal
Removes the Power Sink Objective
2021-02-10 02:09:09 -07:00
silicons
e8da810cd3 Merge pull request #14205 from keronshb/warpimplant-adjustment
Triples Warp Implant's cooldown
2021-02-10 02:08:57 -07:00
silicons
ca906eb683 Merge pull request #14208 from dzahlus/grenadelaunch.ogg
sound PR oversights fix
2021-02-10 02:07:57 -07:00
silicons
7c27de3735 Merge pull request #14216 from timothyteakettle/blood-fixes
corrects two persistent blood related issues
2021-02-10 02:07:49 -07:00
silicons
ec2ae053ce Merge pull request #14215 from Putnam3145/readied-only
Added a config to disallow unreadied players from voting on modes
2021-02-10 02:07:37 -07:00
silicons
c82f0a4f5b Merge pull request #14214 from Adelphon/gclothing
Clothing PR
2021-02-10 02:07:27 -07:00
Timothy Teakettle
09fdb5f83a Update apc_control.dm 2021-02-09 09:48:17 +00:00
Timothy Teakettle
5ebdb6deec yes 2021-02-09 09:37:17 +00:00
Putnam
7a6ed7f500 Added a config to disallow unreadied players from voting on modes/storytellers 2021-02-08 22:59: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
b3ab2722f0 fug 2021-02-08 14:48:53 +01: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
TyrianTyrell
e5fea58776 Update good.dm 2021-02-08 07:32:22 -05:00
TyrianTyrell
b7b8be6f39 Update language.dm 2021-02-08 07:27:47 -05: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