Commit Graph
40589 Commits
Author SHA1 Message Date
silicons ea56565872 fix 2021-01-14 20:19:04 -07:00
silicons 8f7b483161 remove reverb 2021-01-13 21:37:30 -07:00
silicons ae290cf5f0 newlines 2021-01-13 16:56:36 -07:00
silicons 9ddb3dc5d9 fix 2021-01-13 16:22:43 -07:00
silicons ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -07:00
silicons 343ef7db2c fixes 2021-01-13 14:23:35 -07:00
silicons 3fe2776a6a fix 2021-01-13 13:44:46 -07:00
CitadelStationBot 1fd9bc8a50 Automatic changelog generation for PR #14015 [ci skip] 2021-01-13 12:40:07 -06:00
LinandGitHub 04c5d34cb6 Merge pull request #14015 from DeltaFire15/synth-stuffs
Tweaks some Synth damage stuff
2021-01-13 18:40:03 +00:00
CitadelStationBot 57d1052a6a Automatic changelog generation for PR #14033 [ci skip] 2021-01-13 11:39:44 -06:00
DeltaFireandGitHub 6bdca6b8e4 Merge pull request #14033 from BlueWildrose/colormateys
Adds Color Mates to every station (except Snaxi)
2021-01-13 18:39:40 +01:00
CitadelStationBot eba8a16486 Automatic changelog generation for PR #14038 [ci skip] 2021-01-13 11:29:03 -06:00
DeltaFireandGitHub a9b420f68f Merge pull request #14038 from Hatterhat/atomization-never-heard-of-her
an unatomic PR designed for maximizing maintainer suffering
2021-01-13 18:28:59 +01:00
CitadelStationBot 9190fd4786 Automatic changelog generation for PR #14036 [ci skip] 2021-01-13 11:26:25 -06:00
DeltaFireandGitHub 7b02928558 Merge pull request #14036 from BlueWildrose/YouMadeMeDropMyCatgirl
You will no longer unbuckle fireman-carried/piggybacked people when touching someone on help or grab intent
2021-01-13 18:26:22 +01:00
DeltaFireandGitHub 16c8ff1e52 Merge pull request #14027 from MrJWhit/stops-code-from-seeping-into-ic-chat
Port: "stops code from seeping into ic chat"
2021-01-13 18:21:30 +01:00
DeltaFireandGitHub 84a95e5ddd Merge pull request #13994 from Citadel-Station-13/clowncar-safety
hugboxes admin twitchplays clown car to not explode on death to avoid killing people (by default)
2021-01-13 17:56:00 +01:00
CitadelStationBot a2ef243c6d Automatic changelog generation for PR #14019 [ci skip] 2021-01-13 10:55:04 -06:00
DeltaFireandGitHub 68557c84ae Merge pull request #14019 from timothyteakettle/stop-abusing-envys-knife
species with NOTRANSSTING cannot have envy's knife used on them
2021-01-13 17:54:57 +01:00
Hatterhat 508475d2a4 sabre off inhand fix 2021-01-12 16:36:02 -06:00
Hatterhat 2042de0f19 sterilegauze buff 2021-01-12 16:13:08 -06:00
Hatterhat cb40ad4764 atomization is cowardice actually 2021-01-12 16:08:17 -06:00
Blue Wildrose 5436db5f3b Add a color mate to the ghost cafe as well, yeah 2021-01-12 13:55:42 -07:00
Blue Wildrose 059d35921a quit making me drop my catgirl 2021-01-12 13:41:23 -07:00
Blue Wildrose 32aa851062 somethings up with the HoS pet carp on Kilo, fixing that 2021-01-12 06:54:06 -07:00
Blue Wildrose 8111757e5b oops messed something up with kilo 2021-01-12 06:49:31 -07:00
Blue Wildrose 2ab6a5cf96 Adds Colormates to every map except Snaxi 2021-01-12 06:26:13 -07:00
CitadelStationBot f40955f6dc Automatic changelog generation for PR #14026 [ci skip] 2021-01-12 02:20:52 -06:00
siliconsandGitHub 09772543b9 Merge pull request #14026 from BlueWildrose/SkidoodleSkidaddle
Skidaddle skidoodle, your 12+ inch dick no longer looks like a noodley elephant trunk
2021-01-12 01:20:49 -07:00
BlueWildroseandGitHub 19078449fe Merge branch 'master' into SkidoodleSkidaddle 2021-01-11 20:26:21 -07:00
DeltaFireandGitHub 63aaac873f Merge pull request #13973 from Citadel-Station-13/shitcode
completely removes penis/breast enlargement effects due to it being completely unmaintained and to be frank awful
2021-01-12 01:30:24 +01:00
LinandGitHub 9d4b30d4e9 Merge pull request #14023 from Citadel-Station-13/silicons-patch-8
the disk now snores every minute instead of every 2 seconds
2021-01-12 00:01:44 +00:00
MrJWhit 893199679d Update arcade.dm 2021-01-11 08:46:12 -05:00
Blue Wildrose b4fbeddda9 Probably makes more sense 2021-01-11 00:12:13 -07:00
Blue Wildrose 4ec834c3dd your dick is no longer a big fat noodle 2021-01-11 00:00:48 -07:00
LinandGitHub 95101ac36a Merge pull request #14013 from Citadel-Station-13/compressor
lets science actually print explosive compressors
2021-01-11 00:21:11 +00:00
08d2b0bc17 Update code/modules/ruins/objects_and_mobs/sin_ruins.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-01-10 23:41:52 +00:00
LinandGitHub f4c4e0721b Merge pull request #14012 from Citadel-Station-13/silicons-patch-6
fixes colormate last_matrix saving (again)
2021-01-10 19:36:47 +00:00
siliconsandGitHub cd62c45902 Update nuclearbomb.dm 2021-01-10 03:52:16 -07:00
CitadelStationBot e998fd4e34 Automatic changelog generation for PR #13993 [ci skip] 2021-01-10 02:36:46 -06:00
siliconsandGitHub 72bc00bc22 Merge pull request #13993 from Arturlang/cursed_heart_tweaks
Makes cursed heart more tolerable
2021-01-10 01:36:43 -07:00
Putnam3145andGitHub 07399d2c93 Merge pull request #13949 from Citadel-Station-13/silicons-patch-60
clamps cyborg sprint to 10 tiles/second and fixes them going methspeed
2021-01-09 22:16:14 -08:00
CitadelStationBot 1265995f60 Automatic changelog generation for PR #14014 [ci skip] 2021-01-09 20:49:13 -06:00
siliconsandGitHub 121104ca6c Merge pull request #14014 from necromanceranne/bokken_fixes_2
Bokken Fixes 2: Missing sprites and stuff
2021-01-09 19:49:10 -07:00
timothyteakettle 99b26c08be Update sin_ruins.dm 2021-01-10 01:56:18 +00:00
DeltaFireandGitHub eac7959f01 Merge pull request #14017 from Citadel-Station-13/silicons-patch-7
fixes stabilized oil extracts making infinite explosions
2021-01-10 02:22:40 +01:00
siliconsandGitHub fd77be9b89 Update _status_effects.dm 2021-01-09 16:44:56 -07:00
silicons 2525334bb0 smooth movement twaeks 2021-01-09 15:30:56 -08:00
silicons 9733305997 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-09 14:56:32 -08:00
silicons e680d58a03 fixes 2021-01-09 14:56:29 -08:00