Ghommie
|
c7db3ad8f9
|
Porting a couple atmos performance improvements.
|
2019-07-16 23:51:38 +02:00 |
|
Ghommie
|
676186ee36
|
Ports "Removes some getflaticon calls from things that don't draw browser interfaces"
|
2019-07-16 23:15:52 +02:00 |
|
Ghommie
|
b6f10c96a7
|
Modularity was a mistake.
|
2019-07-16 21:05:12 +02:00 |
|
Ghommie
|
9f6a3f428c
|
last bit.
|
2019-07-16 16:15:31 +02:00 |
|
Ghommie
|
0d1988b6be
|
More fixes.
|
2019-07-16 16:10:16 +02:00 |
|
Ghommie
|
75a8cbcc39
|
Makes Zelus flasks a subtype of bottle.
|
2019-07-16 15:39:30 +02:00 |
|
Trilbyspaceclone
|
4c971ea012
|
from afar
|
2019-07-15 22:12:20 -04:00 |
|
kevinz000
|
9995876a59
|
Update ert.dm
|
2019-07-15 17:00:31 -07:00 |
|
kevinz000
|
bdf4f11ab8
|
Update ert.dm
|
2019-07-15 16:56:51 -07:00 |
|
kevinz000
|
f16328c6e7
|
Update ert.dm
|
2019-07-15 16:55:40 -07:00 |
|
Trilbyspaceclone
|
3422dad9ec
|
Update bottle.dm
|
2019-07-15 17:07:53 -04:00 |
|
Thalpy
|
9c7b1dee97
|
Merge branch 'master' into master
|
2019-07-15 21:23:04 +01:00 |
|
Bapldap
|
2fec4a51b0
|
Update traitor_bro.dm
|
2019-07-15 13:26:21 -05:00 |
|
Ghommie
|
dbb17a258a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
|
2019-07-15 17:52:34 +02:00 |
|
Ghommie
|
16a7f6e5b2
|
Merge branch 'master' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit54
|
2019-07-15 17:46:13 +02:00 |
|
Ghommie
|
fac3e65c68
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
|
2019-07-15 17:42:47 +02:00 |
|
Ghommie
|
1e1f8e627f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-07-15 17:33:41 +02:00 |
|
Ghommie
|
4df4cbd721
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-07-15 17:23:01 +02:00 |
|
Seris02
|
59f45d3e35
|
adds abductor replication lab with advanced tools
|
2019-07-15 15:18:04 +08:00 |
|
Carlen White
|
bb81a0850b
|
Merge branch 'master' into batch-check-injuries
# Conflicts:
# code/modules/mob/living/carbon/human/human_defense.dm
|
2019-07-14 20:49:52 -04:00 |
|
Carlen White
|
3504f15c01
|
Travis Bump
|
2019-07-14 20:29:23 -04:00 |
|
Trilbyspaceclone
|
2a78caa127
|
Merge branch 'master' into Unmodular
|
2019-07-14 18:27:37 -04:00 |
|
kevinz000
|
61bc43a0d7
|
Merge pull request #8693 from Ghommie/Ghommie-cit70
Ports "clothes burning only spam You of Your clothes"
|
2019-07-14 14:52:29 -07:00 |
|
kevinz000
|
628244c0ba
|
Merge pull request #8869 from Ghommie/Ghommie-cit129
Ports "Show codewords on round end screen"
|
2019-07-14 14:49:11 -07:00 |
|
kevinz000
|
c06d495731
|
Merge pull request #8877 from BurgerLUA/REMOVE-C8A5DC
REMOVE #C8A5DC. COLOR STRONG.
|
2019-07-14 14:48:49 -07:00 |
|
kevinz000
|
1564f38ff8
|
Merge pull request #8725 from Trilbyspaceclone/meme_tools
Adds more bronze tools
|
2019-07-14 14:48:27 -07:00 |
|
kevinz000
|
2c41141d2f
|
Merge pull request #8676 from Trilbyspaceclone/patch-176
Adds a Rapier for 8 Trilby cats
|
2019-07-14 14:46:44 -07:00 |
|
kevinz000
|
9de885da32
|
Merge pull request #8880 from CameronWoof/air-alarms-should-be-green
Makes Air Alarms Green
|
2019-07-14 14:20:54 -07:00 |
|
kevinz000
|
705b12fc50
|
Merge pull request #8724 from Trilbyspaceclone/Rnd_brakeup
Brakes up Blue space Rnd tech nodes
|
2019-07-14 14:20:03 -07:00 |
|
kevinz000
|
33250dfcbe
|
buffs it a bit
|
2019-07-14 14:16:44 -07:00 |
|
kevinz000
|
102bede4be
|
Merge pull request #7544 from deathride58/nanitepoolnerf
Nerfs nanite pools
|
2019-07-14 14:15:53 -07:00 |
|
kevinz000
|
da8b43f054
|
Merge pull request #8785 from Trilbyspaceclone/Just_Smile!
Makes Clowns and HonkMother Chaplins smile!
|
2019-07-14 14:11:09 -07:00 |
|
kevinz000
|
2ec5d3f02e
|
Merge pull request #8886 from Ghommie/Ghommie-cit137
Ports "Refactors NODROP flag into TRAIT_NODROP"
|
2019-07-14 14:05:20 -07:00 |
|
kevinz000
|
a573689101
|
Merge pull request #8887 from Poojawa/last-word-hearing-psychics
Gang victory news report and last words for discord bot
|
2019-07-14 14:04:20 -07:00 |
|
Bapldap
|
bd3f9bddf7
|
Updates Blood Brother
Restricts jobs such as captain and security at roundstart for bloodbrother.
|
2019-07-14 13:54:32 -05:00 |
|
Fermi
|
67510809ef
|
Webedits are a bad trip.
|
2019-07-14 15:14:21 +01:00 |
|
Thalpy
|
f77bcc9765
|
Merge branch 'master' into master
|
2019-07-14 15:10:32 +01:00 |
|
Ghommie
|
a3a2fb03b6
|
My bad, my bad.
|
2019-07-14 14:21:28 +02:00 |
|
kevinz000
|
835e91d46e
|
compile
|
2019-07-14 05:13:47 -07:00 |
|
kevinz000
|
0299cb3dcf
|
tgfusion
|
2019-07-14 03:55:35 -07:00 |
|
kevinz000
|
570fa0cd3b
|
fix
|
2019-07-14 03:53:15 -07:00 |
|
kevinz000
|
395b89d0a1
|
Update RPD.dm
|
2019-07-14 03:42:26 -07:00 |
|
kevinz000
|
b153294a24
|
Merge pull request #8857 from Ghommie/Ghoomie-cit127
Refactoring underwear to allow custom color preferences.
|
2019-07-14 03:38:45 -07:00 |
|
kevinz000
|
44474ddbd0
|
Merge pull request #8873 from Ghommie/Ghommie-cit131
Ports "Fixes clockwork armor armor"
|
2019-07-14 03:38:04 -07:00 |
|
kevinz000
|
d5f156925d
|
Merge pull request #8884 from Ghommie/Ghommie-cit135
Ports "About that beer I owed ya. Adds blueshirt items to sectech and defines them better."
|
2019-07-14 03:37:36 -07:00 |
|
kevinz000
|
735fc5fab6
|
Merge pull request #8845 from Ghommie/Ghommie-cit121
Tweaking the 🅱️ emoji icon.
|
2019-07-14 03:35:33 -07:00 |
|
kevinz000
|
2259ea2e1c
|
Merge pull request #8874 from Ghommie/Ghommie-cit132
Ports the Chem Master choose your pill PR plus post-improvements
|
2019-07-14 03:33:37 -07:00 |
|
kevinz000
|
0adb33474d
|
Update buffing.dm
|
2019-07-14 03:24:59 -07:00 |
|
Fermi
|
8d12d0f017
|
I am very smart
|
2019-07-13 20:02:53 +01:00 |
|
Fermi
|
6c9f37790b
|
Fixing bugs from merge conflicts.
|
2019-07-13 20:02:27 +01:00 |
|