 kappa-sama
|
f69c67cf5c
|
tabs
|
2020-01-08 17:03:48 -05:00 |
|
|
kappa-sama
|
ceea7cd021
|
moves these over too
|
2020-01-08 16:47:22 -05:00 |
|
|
kappa-sama
|
38015d0d02
|
moves this
|
2020-01-08 16:45:52 -05:00 |
|
|
kappa-sama
|
341e076d40
|
refill 2
|
2020-01-08 16:43:47 -05:00 |
|
|
kappa-sama
|
18b78e7671
|
refill
|
2020-01-08 16:43:33 -05:00 |
|
|
kappa-sama
|
ebf8d048fd
|
perhaps?
|
2020-01-08 16:42:16 -05:00 |
|
|
kappa-sama
|
c88f58bb67
|
hm
|
2020-01-08 16:41:44 -05:00 |
|
|
kappa-sama
|
933916a386
|
e
|
2020-01-08 09:46:58 -05:00 |
|
|
Ghom
|
f263a3ea31
|
Merge pull request #10474 from Putnam3145/fix-traitor-again
[s] Fixes traitors
|
2020-01-08 13:48:12 +01:00 |
|
|
Putnam
|
26064e0992
|
crap
|
2020-01-07 17:37:57 -08:00 |
|
|
Putnam3145
|
b09ef97ae3
|
Merge pull request #10305 from BlackMajor/Yeehaw
Various Mining borg changes. And some extras.
|
2020-01-07 16:50:21 -08:00 |
|
|
BlackMajor
|
05a644cc41
|
Revert "Merge branch 'master' into Yeehaw"
This reverts commit 972c03f79f, reversing
changes made to 8ebd698763.
|
2020-01-08 12:26:45 +13:00 |
|
|
BlackMajor
|
972c03f79f
|
Merge branch 'master' into Yeehaw
|
2020-01-08 12:25:50 +13:00 |
|
|
BlackMajor
|
b41c9cd844
|
Sync with master
|
2020-01-08 12:25:22 +13:00 |
|
|
kevinz000
|
4599abde4a
|
Merge pull request #10420 from MrJWhit/radiation-plasma-usage
Increase radiation plasma usage in radiation collector
|
2020-01-06 19:46:42 -08:00 |
|
|
BlackMajor
|
5a97259ba9
|
Fix a couple of bugs, add wrapping paper and destination tagger
|
2020-01-07 15:33:16 +13:00 |
|
|
Lin
|
2ce3b7fbf5
|
Merge pull request #10455 from Ghommie/Ghommie-cit501
Porting some runtime fixes.
|
2020-01-07 01:00:25 +00:00 |
|
|
Lin
|
46420a693d
|
Merge branch 'master' into Ghommie-cit425
|
2020-01-07 00:28:37 +00:00 |
|
|
Ghom
|
d07d436ba2
|
Merge pull request #10384 from Hatterhat/tg-43454-43688-the-one-with-the-cargo
cargo tweaks, new shit, why do digitigrade sprites exist
|
2020-01-06 21:47:15 +01: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 |
|
|
Ghommie
|
dcb2ae77fa
|
Porting some runtime fixes.
|
2020-01-06 02:14:25 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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
|
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 |
|