13931 Commits

Author	SHA1	Message	Date
deathride58	d7cbbfc8a4	Merge pull request #8866 from Citadel-Station-13/kevinz000-patch-54 ... Fixes nanites getting instant nuked by EMPs and shocks and removes the random drain in favor of a scaled drain	2019-07-17 17:48:38 -04:00
deathride58	8f41a29697	Merge pull request #8867 from Citadel-Station-13/kevinz000-patch-56 ... Nerfs chain detonation (removes dev radius)	2019-07-17 17:47:36 -04:00
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
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	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
Trilbyspaceclone	4c971ea012	from afar	2019-07-15 22:12:20 -04:00
Trilbyspaceclone	3422dad9ec	Update bottle.dm	2019-07-15 17:07:53 -04:00
Bapldap	2fec4a51b0	Update traitor_bro.dm	2019-07-15 13:26:21 -05: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
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
Ghommie	a3a2fb03b6	My bad, my bad.	2019-07-14 14:21:28 +02: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
Poojawa	245bd3e650	Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into last-word-hearing-psychics	2019-07-13 10:18:13 -05:00
Poojawa	4d895ae6c0	Gang victory news report and last words for discord bot ... also slight improvement to gangster greetings	2019-07-13 08:38:19 -05:00
Ghommie	129ca9d71f	Ports "Refactors NODROP flag into TRAIT_NODROP"	2019-07-13 10:27:39 +02:00
Ghommie	71720f8a32	missed bits.	2019-07-13 07:12:37 +02:00
Ghommie	8f410429de	Ports "Renames SSsqueak to SSminor_mapping"	2019-07-13 07:08:03 +02:00
Ghommie	31bd9104bb	Ports "Adds blueshirt items to sectech and defines them better."	2019-07-13 06:42:09 +02:00
TrilbySpaceClone	b2345b19ce	critcal	2019-07-12 21:21:52 -04:00
Ghommie	b7c8909a18	Fixing a reagent ID typo.	2019-07-13 02:12:01 +02:00