deathride58
|
9ebdad68b7
|
Merge pull request #8892 from Citadel-Station-13/kevinz000-patch-61
Fixes RPD infinite transit tube stacking
|
2019-07-17 17:47:09 -04:00 |
|
deathride58
|
c36f25144b
|
Merge pull request #8890 from Citadel-Station-13/kevinz000-patch-59
Nerfs nanite armor
|
2019-07-17 17:46:41 -04:00 |
|
kevinz000
|
70d7ebbb45
|
Merge pull request #8881 from Ghommie/Ghommie-cit134
Fixing a reagent ID typo.
|
2019-07-17 14:44:54 -07:00 |
|
BurgerLUA
|
03ef2c5257
|
Merge branch 'master' into NO-MORE-FETISH-CONTENT
|
2019-07-17 14:17:33 -07:00 |
|
deathride58
|
ea5837bfb1
|
double the sanity check, double the stability
|
2019-07-17 16:54:02 -04:00 |
|
deathride58
|
42aae8f45f
|
fixing warp whistles in literally two fucking lines
|
2019-07-17 16:49:46 -04:00 |
|
Trilbyspaceclone
|
bc158f4fd8
|
Update code/modules/food_and_drinks/drinks/drinks/bottle.dm
weh
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-07-17 16:39:14 -04:00 |
|
Ghommie
|
9384af188e
|
Gives cult conversions an alert popup and a couple extra seconds.
|
2019-07-17 17:50:54 +02:00 |
|
kevinz000
|
b134d23ea3
|
Merge pull request #8882 from Trilbyspaceclone/slaggy
Adds discount plushies and a way to get random plushies at shift start
|
2019-07-17 00:50:21 -07:00 |
|
TrilbySpaceClone
|
ba63926905
|
Sitting on the job
|
2019-07-16 22:42:57 -04:00 |
|
Ghommie
|
8bd64598c5
|
umh mh...
|
2019-07-17 01:32:33 +02:00 |
|
Ghommie
|
408c9aec51
|
Nothing the power of copypasta won't stop.
|
2019-07-17 01:01:33 +02:00 |
|
Ghommie
|
ee32e1680f
|
Ports "Replaces radio channel names and keys with defines"
|
2019-07-17 00:52:41 +02:00 |
|
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
|
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 |
|
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
|
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 |
|