Commit Graph
26895 Commits
Author SHA1 Message Date
51a17dff94 Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-12-16 09:23:42 -05:00
c291511ab6 Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-12-16 09:23:35 -05:00
bfbb6231a5 Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-12-16 09:23:28 -05:00
2d488bee52 Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-12-16 09:23:21 -05:00
3e86e2207e Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-12-16 09:23:07 -05:00
21b7fb0759 Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-12-16 09:22:58 -05:00
r4d6andGitHub 7142894ce7 Make the boop louder. 2019-12-16 09:02:01 -05:00
r4d6andGitHub 2e4187b7c8 Add a boop sound effect 2019-12-16 08:56:51 -05:00
r4d6andGitHub 728ca4fe99 Add a nose boop sound 2019-12-16 08:54:18 -05:00
a4d6911324 Update code/modules/mob/living/carbon/carbon_defense.dm
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-12-16 07:48:29 -05:00
13aaebcd22 Update code/modules/mob/living/carbon/carbon_defense.dm
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-12-16 07:48:22 -05:00
r4d6andGitHub e8d43dac87 Port boops and handshakes 2019-12-16 06:27:18 -05:00
CitadelStationBot 5f59d7a9c5 Automatic changelog generation for PR #10115 [ci skip] 2019-12-16 05:24:00 -06:00
BlackMajorandGitHub d1a37fd192 Merge pull request #10115 from Useroth/lavaland-tumors
[READY] Ported lavaland tumors and elites from tg.
2019-12-17 00:23:57 +13:00
Useroth 8151a1f3ff Merged master into this branch. 2019-12-16 12:06:30 +01:00
CitadelStationBot 6e08366d40 Automatic changelog generation for PR #9736 [ci skip] 2019-12-15 21:20:41 -06:00
LinandGitHub b54c8a6a2a Merge pull request #9736 from Citadel-Station-13/kevinz000-patch-113
I want to have a word with whoever wrote the original antagonist reputation proc
2019-12-16 03:20:38 +00:00
CitadelStationBot 05460586e1 Automatic changelog generation for PR #9971 [ci skip] 2019-12-15 21:11:11 -06:00
kevinz000andGitHub ba7a3f5fd2 Merge pull request #9971 from Xantholne/xantholne-christmas01
Adds the Christmas Clothes you never knew you wanted.
2019-12-15 20:11:09 -07:00
BlackMajorandGitHub 74cc1ec547 Merge pull request #10177 from BlackMajor/FIST
NUCLEAR FIST. A new wizard spell involving punching people so hard they explode.
2019-12-16 14:14:35 +13:00
Unknown ad88481f3e OwO whats this notices your 2019-12-15 16:45:34 -07:00
CitadelStationBot bdb6ef4dda Automatic changelog generation for PR #10198 [ci skip] 2019-12-15 17:42:16 -06:00
Putnam3145andGitHub 363380405e Merge pull request #10198 from Ghommie/Ghommie-cit466
Fixes ranged syndicate mobs stormtrooper training: The port.
2019-12-15 15:42:13 -08:00
CitadelStationBot 050551e569 Automatic changelog generation for PR #10195 [ci skip] 2019-12-15 17:25:02 -06:00
Putnam3145andGitHub 56a349bcd0 Merge pull request #10195 from Ghommie/Ghommie-cit464
Fixes a few quirks not being properly removed when deleted, also bringing them in line with the rest instead of being removable through surgery.
2019-12-15 15:24:59 -08:00
CitadelStationBot 78575bd47d Automatic changelog generation for PR #10197 [ci skip] 2019-12-15 17:24:20 -06:00
Putnam3145andGitHub 7aa454dbbb Merge pull request #10197 from Ghommie/Ghommie-cit465
fixing double-flavour (and bland custom) ice creams.
2019-12-15 15:24:17 -08:00
Ghommie 22aba489e3 Fixes ranged syndicate mobs stormtrooper training: The port. 2019-12-16 00:21:28 +01:00
Unknown 008c4ef822 according to all known laws of aviation 2019-12-15 16:18:42 -07:00
Unknown 9bfba1d1d9 Merge branch 'master' into xantholne-christmas01 2019-12-15 16:14:37 -07:00
Ghommie 0a4a2acbab fixing double-flavour ice creams. 2019-12-16 00:00:58 +01:00
CitadelStationBot 423b2e7e90 Automatic changelog generation for PR #10011 [ci skip] 2019-12-15 16:41:39 -06:00
Putnam3145andGitHub c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers
Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00
Ghommie 7118210911 GOTTA KEEP THIS AROUND UNTIL OFFSTATION ANTAGS ARE STOPPED FROM BEING QUIRK'D.
WIZARDS GOTTA CHANT THEIR MAGICK SOMEHOW.
2019-12-15 23:07:18 +01:00
Artur 58f4f58cd2 Slaughter demons shouldnt bleed 2019-12-16 00:05:51 +02:00
Ghommie 6593b2a5a7 Fixes some quirks not being properly removed when deleted. 2019-12-15 23:02:41 +01:00
CitadelStationBot 7ee71f9702 Automatic changelog generation for PR #10144 [ci skip] 2019-12-15 14:08:48 -06:00
Putnam3145andGitHub b7d082a204 Merge pull request #10144 from Linzolle/sabre-noise
makes the officer's sabre play the un/sheating noise properly
2019-12-15 12:08:46 -08:00
BlackMajor c6732bb516 typo lol 2019-12-16 01:28:34 +13:00
BlackMajor 4b177c4956 Adjusted NF balance 2019-12-16 01:20:14 +13:00
CitadelStationBot 8e97b0e331 Automatic changelog generation for PR #10166 [ci skip] 2019-12-14 22:37:59 -06:00
Putnam3145andGitHub 2e9503f6d7 Merge pull request #10166 from Ghommie/Ghommie-cit457
Ports "Roundstart borg brains no longer decay."
2019-12-14 20:37:57 -08:00
CitadelStationBot 0921c3541a Automatic changelog generation for PR #9970 [ci skip] 2019-12-14 18:16:37 -06:00
LinandGitHub cce63507d1 Merge pull request #9970 from Ghommie/Ghommie-cit402
they're pretty bad, I'm not sure how these actually got in actually. thanks kevin
2019-12-15 00:16:34 +00:00
Unknown 73abc2ae40 Merge branch 'master' into xantholne-christmas01 2019-12-14 17:15:00 -07:00
CitadelStationBot 979807926f Automatic changelog generation for PR #10122 [ci skip] 2019-12-14 18:05:01 -06:00
LinandGitHub 49c37641a7 Merge pull request #10122 from Citadel-Station-13/kevinz000-patch-124
nerfs factorio (conveyors can no longer stack more than 150 items on one tile)
2019-12-15 00:04:58 +00:00
CitadelStationBot 773d574427 Automatic changelog generation for PR #10150 [ci skip] 2019-12-14 18:03:00 -06:00
LinandGitHub 1f852ea92a Merge pull request #10150 from Trilbyspaceclone/patch-245
Corrects telegram hat icon, adds a new dog fashion to telegram hat
2019-12-15 00:02:57 +00:00
CitadelStationBot f24dfa6387 Automatic changelog generation for PR #10163 [ci skip] 2019-12-14 18:00:01 -06:00