Commit Graph

21280 Commits

Author SHA1 Message Date
kevinz000
3e073f160c Merge pull request #10910 from Citadel-Station-13/Ghommie-patch-6
Fixing a little issue with sleeper UI and blood types.
2020-02-19 19:00:32 -07:00
kevinz000
6df64da7d6 Merge pull request #11133 from Citadel-Station-13/Ghommie-patch-2
Nerfs the fermenting barrel export industry & co.
2020-02-19 19:00:02 -07:00
kevinz000
1c2dca4a00 Merge pull request #11132 from Ghommie/Ghommie-cit585
Something about tesla revolvers and tk.
2020-02-19 18:59:44 -07:00
kevinz000
530416a5ac Merge pull request #11147 from Putnam3145/supermatter-objective-fix
Supermatter sabotage no longer shows up with no supermatter
2020-02-19 18:59:28 -07:00
kevinz000
b983aa75ea Merge pull request #11145 from Ghommie/Ghommie-cit586
Something about pAIs and silicon access priviledges.
2020-02-19 18:59:10 -07:00
Hatterhat
6b1a721f1c literally a mouth cover check 2020-02-19 17:51:18 -06:00
Arturlang
901b54b7e8 Webedit man to the doom and rescue 2020-02-20 01:38:28 +02:00
Hatterhat
0ad49f9004 shit dude i hope this works lmao 2020-02-19 17:18:51 -06:00
Kraseo
cd56e29a98 drink my ass kevinz 2020-02-20 00:18:43 +01:00
Arturlang
796f51b557 Merge branch 'master' into TGUI_Next_Nanites 2020-02-20 00:52:55 +02:00
kevinz000
b66b8ac2a0 Merge remote-tracking branch 'citadel/master' into staves 2020-02-19 14:32:28 -07:00
Ghom
304026a4f8 Merge pull request #11151 from Putnam3145/map-irv-fix
Fixed map vote type config
2020-02-19 21:13:48 +01:00
Putnam
dd3520896a wow there's an else 2020-02-19 11:45:37 -08:00
Putnam
3bf1ac590c it's probably better that it works 2020-02-19 11:00:56 -08:00
Putnam
b76b346f2d whoops 2020-02-19 10:56:43 -08:00
Putnam
395fb8de3e Added licking pref. 2020-02-19 10:49:26 -08:00
necromanceranne
af6df2784c holy shit this was still in the fucking game 2020-02-20 04:46:30 +11:00
Kraseo
f532c1a444 i spent 2 hours figuring out how to fix this 2020-02-19 18:40:30 +01:00
Unknown
c920d198e2 Update Viro to /tg/ standards 2020-02-19 12:17:57 -05:00
Ghom
eb342d1591 Update mood.dm 2020-02-19 17:14:30 +01:00
kevinz000
9289ca8873 fix 2020-02-19 08:14:28 -07:00
kevinz000
15c56e6a12 crlf 2020-02-19 07:56:16 -07:00
kevinz000
34fbcd1dc0 fixes 2020-02-19 07:49:05 -07:00
kevinz000
4a537d770d let's make this work 2020-02-19 07:20:16 -07:00
Ghommie
ee1f61b5de F 2020-02-19 14:26:11 +01:00
Ghommie
057b6f591c HEEY 2020-02-19 14:23:12 +01:00
Ghommie
37ba75ec12 Fixing addiction moodlets not going away and secret sauce recipe paper. 2020-02-19 14:07:11 +01:00
Artur
d635af0caa Conflict Fix 2020-02-19 13:11:33 +02:00
Artur
87d55c5be6 Reworks it 2020-02-19 13:09:09 +02:00
Putnam
6aec971b4e haha i'm dumb 2020-02-18 21:41:00 -08:00
raspyosu
a570a8fea8 this is fine
it's fine
2020-02-18 23:24:01 -05:00
raspyosu
6e013d7f8c zzzzzz
the rest of the changes to be described in new pr
2020-02-18 23:18:52 -05:00
kevinz000
950082f537 k 2020-02-18 20:49:42 -07:00
Winter Flare
00d66c9b91 Renamed CAT_FISH to CAT_EASTERN 2020-02-18 22:19:58 -05:00
Putnam
60f819465c what. what. what. what. what. 2020-02-18 18:30:15 -08:00
kevinz000
0229db9c61 trait comsigs 2020-02-18 18:23:01 -07:00
kevinz000
0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
Ghom
479cdccd17 Merge pull request #11138 from Citadel-Station-13/kevinz000-patch-11
The game's BUILT IN AUTOCLICKER no longer triggers the autoclicker detection system
2020-02-19 02:12:42 +01:00
Ghom
0619521418 Merge pull request #10980 from Trilbyspaceclone/cargo_memes_4
Corrects a few cargo crates/exports (and nerfs some)
2020-02-19 02:10:25 +01:00
Ghom
4d39bae16b Merge pull request #11103 from PersianXerxes/cargoTraitorObjectivesRDumb
Clarifies comments and locks defusal kits behind an emag
2020-02-19 02:09:02 +01:00
Ghom
77d5c09858 Merge pull request #11124 from Citadel-Station-13/kevinz000-patch-7
Bandaids a projectile runtime, removes an unused variable
2020-02-19 02:05:49 +01:00
raspyosu
9803a0835c lunge tweaks
added short (20 frames at 30fps) windup w/ telegraphing via audio only played to target
range increased to 4
added flavor text
2020-02-18 19:04:20 -05:00
Putnam
a9edff6e56 Supermatter sabotage no longer shows up with no supermatter 2020-02-18 11:51:03 -08:00
Putnam
2834994587 why didn't we do this sooner 2020-02-18 11:34:09 -08:00
Ghom
2b7f27270f Merge pull request #11083 from Hatterhat/sword-cleaning
purifying longswords - alt title "there's no way this should have worked"
2020-02-18 19:02:34 +01:00
Ghom
08c86ec1ea Merge pull request #11091 from BlueWildrose/master
Podpeople species tail wag fix; also lifebringer name fix
2020-02-18 17:11:50 +01:00
Ghom
6ea2843149 Merge pull request #11131 from Seris02/demondabbing
nerfs bloodcrawl to a cooldown of 0.6 seconds instead of no cooldown
2020-02-18 17:02:17 +01:00
Ghommie
698f0b8177 Something about pAIs and silicon access priviledges. 2020-02-18 16:20:44 +01:00
kevinz000
3785c94a1b more responsive 2020-02-18 03:57:39 -07:00
kevinz000
ef05410b75 k 2020-02-18 03:32:04 -07:00