 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 |
|
|
Ghom
|
14ec7d963a
|
Merge pull request #10224 from Seris02/traitblacklisting
Makes trait blacklisting remove random positives instead of removing every quirk (new and improved)
|
2020-01-05 21:29:51 +01:00 |
|
|
Ghom
|
1a834edd5f
|
f
|
2020-01-05 21:27:04 +01:00 |
|
|
kevinz000
|
4d151b2a7c
|
Update twohanded.dm
|
2020-01-05 11:20:13 -08:00 |
|
|
kevinz000
|
46cf029a28
|
Update twohanded.dm
|
2020-01-05 11:19:18 -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
|
eeb9ec5f35
|
Merge pull request #10380 from Hatterhat/tg-43000-powerfists
powerfists throw people faster but also leak their gas into the air
|
2020-01-05 15:12:06 +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 |
|
|
Putnam
|
be98704abe
|
weird super secret vote
|
2020-01-05 04:19:21 -08:00 |
|
|
Letter N
|
ba7f0dab62
|
doppler logs!
|
2020-01-05 19:16:37 +08:00 |
|
|
Trilbyspaceclone
|
609f120c28
|
Update hardsuit.dm
|
2020-01-04 22:29:42 -05:00 |
|
|
Hatterhat
|
f166586ca0
|
a comma
|
2020-01-04 21:05:55 -06:00 |
|
|
Hatterhat
|
5b0d20cf37
|
this one fucking tab
|
2020-01-04 19:52:01 -06:00 |
|
|
Hatterhat
|
46ced736ba
|
what the fuck was that damage my guy
|
2020-01-04 19:51:06 -06: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 |
|
|
Ghom
|
ca8d93ad17
|
Merge branch 'master' into alcohol-intolerance
|
2020-01-04 23:17:55 +01:00 |
|
|
Ghom
|
9e257599ab
|
Merge pull request #10413 from nik707/master
Reduces engraving light power
|
2020-01-04 22:30:37 +01:00 |
|
|
Ghom
|
7bebd13c54
|
Merge pull request #10412 from Linzolle/matchbox-cars
matchbox runtime fix
|
2020-01-04 22:30:13 +01:00 |
|
|
Ghom
|
e85c710962
|
Merge pull request #10399 from Citadel-Station-13/kevinz000-patch-4
Knocks down cargo passive gen 750 -> 500
|
2020-01-04 21:48:48 +01:00 |
|
|
Ghommie
|
356304f68f
|
Fixes roundstart mushpeople not having MUSH PUUUUUUUUUUUUNCH!!
|
2020-01-04 20:34:31 +01:00 |
|
|
Ghom
|
a75b8a387e
|
ok
|
2020-01-04 18:30:37 +01:00 |
|
|
Ghom
|
07a5f052d3
|
Merge pull request #10400 from chefferz/chefferz-toiletshuttle
Gives ability to buckle yourself to a toilet
|
2020-01-04 14:25:54 +01:00 |
|
|
Ghom
|
3086b5eb38
|
boolean
|
2020-01-04 14:19:15 +01:00 |
|
|
Hatterhat
|
92f6fe129a
|
tgstation 40394 port
|
2020-01-04 07:14:39 -06:00 |
|
|
Ghom
|
499907f9b7
|
Merge pull request #10191 from Citadel-Station-13/michael_labs
Custom Holoforms for pAIs and AIs oh and adds certain cyborg pai holograms. also mild pai nerf.
|
2020-01-04 14:07:25 +01:00 |
|
|
Ghom
|
39da7cc58e
|
Merge pull request #10419 from Citadel-Station-13/kevinz000-patch-6
HELP I CANT POWERGAME NANITES IF I CANT MAKE NANITE MACHINES (please testmerge these things more)
|
2020-01-04 14:03:01 +01:00 |
|
|
Ghommie
|
686a76dd1d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-04 13:35:05 +01:00 |
|
|
kevinz000
|
a930464f57
|
Update extra_drone_types.dm
|
2020-01-04 00:54:06 -08:00 |
|
|
Hatterhat
|
97242050ec
|
bad idea
|
2020-01-04 02:16:55 -06:00 |
|
|
Hatterhat
|
5142a0e4ae
|
that should probably be there
|
2020-01-04 02:07:19 -06:00 |
|
|
Hatterhat
|
7c98656939
|
upstream merge
|
2020-01-04 01:48:50 -06:00 |
|
|
kevinz000
|
0567dcd6df
|
Update godhand.dm
|
2020-01-03 23:34:37 -08:00 |
|
|
kevinz000
|
a4fa24ac15
|
Update touch_attacks.dm
|
2020-01-03 23:33:39 -08:00 |
|