Commit Graph
35916 Commits
Author SHA1 Message Date
CitadelStationBot db995ca9b6 Automatic changelog generation for PR #12893 [ci skip] 2020-07-26 17:27:27 -05:00
LinandGitHub 6514fced3c Merge pull request #12893 from timothyteakettle/picklefix
pickles don't die until their contents is released
2020-07-26 17:27:23 -05:00
LinandGitHub c36bf1b5ed Merge pull request #12871 from Citadel-Station-13/silicons-patch-47
ports some tg changes to make clients properly garbage collect
2020-07-26 17:26:38 -05:00
LinandGitHub 6b12563abe Merge pull request #12881 from Citadel-Station-13/silicons-patch-48
since it's a little hard to fix the actual issue let's just make the projectile safety check that's causing stuff to freeze when something goes wrong more lenient so things don't freeze and people don't think anything is wrong
2020-07-26 17:26:19 -05:00
LinandGitHub 04b6d854f8 Merge pull request #12914 from Citadel-Station-13/silicons-patch-56
forensic scanners no longer pick up color in blood dna
2020-07-26 17:24:33 -05:00
LinandGitHub 4b56dc65af Merge pull request #12897 from Citadel-Station-13/silicons-patch-51
fixes clothes repairs
2020-07-26 17:24:21 -05:00
LinandGitHub ea737d63dd Merge pull request #12904 from Citadel-Station-13/silicons-patch-54
proper fix for every borg being able to have mops, but doesn't remove the upgrade entirely
2020-07-26 17:22:47 -05:00
LinandGitHub b3722d0a43 Merge pull request #12913 from Citadel-Station-13/silicons-patch-55
atmos microoptimizations
2020-07-26 17:22:03 -05:00
Changelogs 05ee056f25 Automatic changelog compile [ci skip] 2020-07-26 00:10:51 +00:00
CitadelStationBot ee02d70afd Automatic changelog generation for PR #12872 [ci skip] 2020-07-25 17:40:18 -05:00
siliconsandGitHub 91081ef24c Merge pull request #12872 from Iatots/hairball
Adds depth to the lick wounds mechanic.
2020-07-25 15:40:15 -07:00
siliconsandGitHub ad5f47ea8f Update scanner.dm 2020-07-25 15:29:44 -07:00
siliconsandGitHub 75213ceef2 Update LINDA_turf_tile.dm 2020-07-25 13:58:38 -07:00
CitadelStationBot 49f0a765a0 Automatic changelog generation for PR #12877 [ci skip] 2020-07-25 14:08:11 -05:00
siliconsandGitHub 774bceb266 Merge pull request #12877 from dapnee/meta-dab
What if Meta Arrivals Weren't An Eye Sore?
2020-07-25 12:08:08 -07:00
CitadelStationBot 8a360db492 Automatic changelog generation for PR #12909 [ci skip] 2020-07-25 13:31:13 -05:00
LinandGitHub 892053e3d9 Merge pull request #12909 from DeltaFire15/death-machine-broke
[FUCK] Fixes organ decay
2020-07-25 13:31:10 -05:00
DeltaFire db823ac16c fixes the organ bitfields 2020-07-25 19:13:08 +02:00
siliconsandGitHub d8a91d9ffa Update robot_upgrades.dm 2020-07-25 02:35:53 -07:00
siliconsandGitHub 4d83060ba1 Update clothing.dm 2020-07-24 19:29:29 -07:00
timothyteakettle e273d327bd yeah 2020-07-25 01:11:04 +01:00
Changelogs 571beb24b0 Automatic changelog compile [ci skip] 2020-07-25 00:11:03 +00:00
IatotsandGitHub a31e160227 this return stone keeps the null tigers away 2020-07-24 16:06:35 +02:00
b6437a4ada Update code/game/objects/items/plushes.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
2020-07-24 15:23:11 +02:00
83c6dc65ba Update code/modules/reagents/chemistry/reagents/other_reagents.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
2020-07-24 15:22:56 +02:00
2eade6c149 Update code/modules/reagents/chemistry/reagents/other_reagents.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
2020-07-24 15:22:38 +02:00
IatotsandGitHub a9c51fc624 Update other_reagents.dm 2020-07-24 08:40:48 +02:00
IatotsandGitHub ec2bd9b876 Update plushes.dm 2020-07-24 08:40:25 +02:00
IatotsandGitHub f53f7c5e92 Update cuts.dm 2020-07-24 07:46:09 +02:00
siliconsandGitHub 99737b6e11 Update projectile.dm 2020-07-23 18:35:32 -07:00
CitadelStationBot a88fa29682 Automatic changelog generation for PR #12879 [ci skip] 2020-07-23 20:12:01 -05:00
nik707andGitHub 6117b7d81e Merge pull request #12879 from timothyteakettle/let-bots-wear-hats
beepsky replaces THREAT_LEVEL with the actual threat
2020-07-23 20:11:57 -05:00
timothyteakettle adc4c76be7 fix 2020-07-24 02:00:22 +01:00
CitadelStationBot 3fe1690f44 Automatic changelog generation for PR #12880 [ci skip] 2020-07-23 19:46:42 -05:00
nik707andGitHub 5a2a2d69ae Merge pull request #12880 from CameronWoof/aloe-icon
Gives aloe an item icon
2020-07-23 19:46:39 -05:00
CameronWoof 68d46e5f0d gives aloe an item icon 2020-07-23 17:41:08 -07:00
timothyteakettle 332dae9ee1 beepsky now replaces THREAT_LEVEL with the threat 2020-07-24 01:31:07 +01:00
Changelogs 5683013907 Automatic changelog compile [ci skip] 2020-07-24 00:10:34 +00:00
CitadelStationBot e0915621a8 Automatic changelog generation for PR #12878 [ci skip] 2020-07-23 18:20:09 -05:00
siliconsandGitHub 5182f8e49a Merge pull request #12878 from Citadel-Station-13/Linzolle-patch-1
maybe you should be able to see wound descriptions
2020-07-23 16:20:05 -07:00
CitadelStationBot 30a6ddd963 Automatic changelog generation for PR #12857 [ci skip] 2020-07-23 18:18:20 -05:00
siliconsandGitHub d946998fb9 Merge pull request #12857 from timothyteakettle/let-bots-wear-hats
adds deep beepsky lore to the game in the form of hats
2020-07-23 16:18:17 -07:00
LinandGitHub a655502d9a tabs! 2020-07-23 22:58:00 +00:00
dapnee 6f0860d1d3 What if Meta Arrivals Weren't An Eye Sore?
Whack of you to assume this is kosher to make arrivals look like shit like that.
2020-07-23 16:36:54 -06:00
LinandGitHub 8a25582c1c Merge pull request #12850 from silicons/drag
fixes dragging stuff into space, enforces no sleeping on Life() and sets Move() to forced async
2020-07-23 17:13:48 -05:00
LinandGitHub 8be94f2ef0 Merge pull request #12873 from silicons/FUCK
FUCK - rewrites sanitize_hexcolor to support converting from RGB to RRGGBB
2020-07-23 16:22:39 -05:00
silicons 03f0d76a8e yeah ok 2020-07-23 13:23:45 -07:00
silicons 6db18f2a53 Merge remote-tracking branch 'citadel/master' into FUCK 2020-07-23 12:59:30 -07:00
silicons cbe0cad1a4 fix 2020-07-23 12:41:33 -07:00
IatotsandGitHub 4da365851f up to regulations now. 2020-07-23 21:27:00 +02:00