Commit Graph

13933 Commits

Author SHA1 Message Date
Artur
8a193304ee Buffs torpor without coffin 2020-01-06 20:22:39 +01:00
Artur
b0cb6aab5c Final commit hopefully 2020-01-06 17:26:36 +01:00
kevinz000
7006f2b1be more compile stuff 2020-01-06 04:23:52 -08:00
kevinz000
c77005af8a changes 2020-01-06 04:17:53 -08:00
kevinz000
a8cc37eaf0 ok 2020-01-06 03:57:58 -08:00
kevinz000
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Artur
00d0d8c415 Whoops indentation 2020-01-06 12:31:54 +01:00
Putnam
32043a9062 whoops forgot permaboner 2020-01-06 01:14:00 -08:00
Putnam
218e701fa9 whoops forgot update appearance 2020-01-05 21:48:04 -08:00
r4d6
f6099f341b Allow Voice Analyzers to recognize languages 2020-01-05 23:55:31 -05:00
r4d6
6d3345d166 Add the Playback Device 2020-01-05 23:32:44 -05:00
Lin
7ad6021472 Merge pull request #10437 from Ghommie/Ghommie-cit497
Fixes roundstart mushpeople being unable to MUSH PUUUUUUUUUUUUNCH!!
2020-01-06 03:49:52 +00:00
Putnam
e7684f5df7 whoops forgot to use sensitivity 2020-01-05 19:29:23 -08:00
Putnam
fba7a8abb0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-05 19:12:28 -08:00
Putnam
d75a525b3c let's fix arousal huh 2020-01-05 19:10:48 -08:00
Ghommie
dcb2ae77fa Porting some runtime fixes. 2020-01-06 02:14:25 +01:00
kevinz000
1f2597784f git commit death 2020-01-05 15:40:23 -08:00
kevinz000
39461e2806 Update beams.dm 2020-01-05 15:16:04 -08:00
kevinz000
aca8c33149 Update beams.dm 2020-01-05 15:08:12 -08:00
kevinz000
f26c02801a Update beams.dm 2020-01-05 15:04:51 -08:00
kevinz000
198b1d5bd4 Update emitter.dm 2020-01-05 15:01:58 -08:00
kevinz000
ab23a934fc Update beams.dm 2020-01-05 15:01:12 -08:00
Ghommie
75d47c2a0d Improves the set_APTFT verb into a proc. 2020-01-05 23:51:42 +01:00
Ghom
869ed7a4aa Merge pull request #10427 from Hatterhat/beakers-but-quirky
beaker tweaks: setting transfer values verb on altclick, value tweaks
2020-01-05 23:08:23 +01:00
Ghom
e18244671f Merge pull request #10350 from Putnam3145/dojo-ghostrole
Ghost cafe quality-of-life, plus making ghost role eligibility an element
2020-01-05 23:05:13 +01:00
Ghom
a8741a8462 As you command. 2020-01-05 23:01:35 +01:00
Ghommie
592422ee70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-05 22:53:00 +01:00
Artur
c438d39eb3 Initial Commit 2020-01-05 22:32:29 +01:00
kevinz000
6e50bb9c03 Revert "Makes mob/Stat on a 1 second timer rather than fast-as-possible to tone down highpop lag" 2020-01-05 12:47:24 -08:00
kevinz000
a8a5ff819d Update IsBanned.dm 2020-01-05 10:06:09 -08:00
kevinz000
4589c7c0c6 Update IsBanned.dm 2020-01-05 08:52:00 -08:00
Ghommie
8c7b648a4f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit425 2020-01-05 17:42:54 +01:00
Trilbyspaceclone
c0f38aa27f Update food_reagents.dm 2020-01-05 11:40:58 -05:00
Ghom
59279a7cd4 Merge pull request #10433 from Citadel-Station-13/kevinz000-patch-7
nerfs pogscarabs
2020-01-05 16:23:37 +01:00
Ghom
516ec585d2 Merge pull request #10435 from Hatterhat/tg-40394
biogenerator can print flour sacks and enzyme now, also some boxes idk
2020-01-05 16:22:44 +01:00
Trilbyspaceclone
9d21a0e000 oil blood b gone 2020-01-05 09:57:11 -05:00
Ghom
5720afb169 Merge pull request #10430 from Citadel-Station-13/VIBE-CHECK
VIBE CHECK
2020-01-05 15:51:32 +01:00
Ghom
8bf75be8ff Yea no, go away zoomer kevinz 2020-01-05 15:38:23 +01:00
Ghom
4655815c12 Merge pull request #10396 from Hatterhat/revert-8056-tegnerf
reverts that one TEG nerf that forced it to require an arbitrary burnmix
2020-01-05 15:36:02 +01:00
Ghom
0646a8557b Merge pull request #10428 from Putnam3145/bomb_fix
Made dev bombs kill through bomb armor again
2020-01-05 15:33:54 +01:00
Ghom
fdff70b702 Merge pull request #10256 from Putnam3145/alcohol-intolerance
Adds an alcohol intolerance trait (NOT light drinker)
2020-01-05 15:19:48 +01:00
Ghom
0e74c94d8c Merge pull request #10278 from Trilbyspaceclone/patch-248
Fixes Fermi plushie reaction. Removes carbonation of caramel
2020-01-05 15:17:14 +01:00
Ghom
2cbf2a2574 Merge pull request #10429 from Trilbyspaceclone/patch-262
Corrects MASON Rig's missing flags
2020-01-05 15:09:05 +01:00
Trilbyspaceclone
609f120c28 Update hardsuit.dm 2020-01-04 22:29:42 -05:00
Trilbyspaceclone
bd42f20047 Update organic.dm 2020-01-04 20:11:10 -05:00
Trilbyspaceclone
850f4ceef1 Update glassware.dm 2020-01-04 20:09:38 -05:00
Trilbyspaceclone
2d573c3f7a carpets are misc 2020-01-04 20:06:54 -05:00
Trilbyspaceclone
67afcc13db Update misc.dm 2020-01-04 20:01:44 -05:00
r4d6
4e528da5c2 Correct price and rpd 2020-01-04 19:06:56 -05:00
Hatterhat
c0e010c612 e 2020-01-04 16:44:11 -06:00