Commit Graph
35872 Commits
Author SHA1 Message Date
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
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
silicons 758d746e96 compile 2020-07-23 12:25:02 -07:00
silicons 59bd63471e sigh 2020-07-23 12:23:13 -07:00
silicons 5d7dfd327c FUCK 2020-07-23 12:22:55 -07:00
LinandGitHub e14f5ff576 Merge pull request #12832 from Citadel-Station-13/overlays-experimental
do we want (probably) free memory savings trick question yes we do
2020-07-23 13:41:36 -05:00
CitadelStationBot 464402ec6d Automatic changelog generation for PR #12821 [ci skip] 2020-07-23 13:41:20 -05:00
LinandGitHub 1f7488aad2 Merge pull request #12821 from Citadel-Station-13/silicons-patch-36
Increases projectile speed across the board by around 40-45%
2020-07-23 13:41:17 -05:00
Timothy Teakettle e4f0a84404 cut overlay 2020-07-23 19:33:26 +01:00
LinandGitHub fbfd6286b5 Merge pull request #12849 from Citadel-Station-13/silicons-patch-43
raises max keybind command length to 32 so controller users don't get kicked
2020-07-23 13:30:31 -05:00
LinandGitHub d112e00c11 Merge pull request #12837 from silicons/apcs
see unoptimized code doesn't matter much until iceboxstation rolls and now said unoptimized code is looping across probably a few tens of thousands of objects and now we have a problem
2020-07-23 13:30:00 -05:00
LinandGitHub 02add89513 Merge pull request #12846 from Citadel-Station-13/silicons-patch-42
it would be real lovely if the server didn't nuke 40 people's characters because the configuration couldn't be loaded because i really hate dll memes
2020-07-23 13:29:18 -05:00
CitadelStationBot 2c4ed01b75 Automatic changelog generation for PR #12848 [ci skip] 2020-07-23 13:28:54 -05:00
LinandGitHub 6fca9af0ed Merge pull request #12848 from silicons/morecolors
species customization now allows 16 million colors instead of 4 thousand
2020-07-23 13:28:50 -05:00
LinandGitHub ddc10e625e Merge pull request #12806 from Citadel-Station-13/silicons-patch-33
adds some more virtual data returns for gas mixture vv (temp, volume, pressure, heat capacity, energy)
2020-07-23 13:20:29 -05:00
LinandGitHub 7352e21877 Merge pull request #12844 from Citadel-Station-13/silicons-patch-41
fixes traitor jobban link
2020-07-23 13:19:25 -05:00
LinandGitHub 69c3d4f24a Merge pull request #12864 from Citadel-Station-13/silicons-patch-45
regarding changelings
2020-07-23 13:18:55 -05:00
LinandGitHub cdd509479e Merge pull request #12868 from Citadel-Station-13/silicons-patch-46
regarding manifest injections
2020-07-23 13:18:35 -05:00
Timothy Teakettle 5463673831 fuck 2020-07-23 19:02:50 +01:00
Timothy Teakettle 673188bc7e please show the hat 2020-07-23 18:57:24 +01:00
Timothy Teakettle b18356c95d requested changes 2020-07-23 18:47:34 +01:00
CitadelStationBot 4917fe378a Automatic changelog generation for PR #12828 [ci skip] 2020-07-23 12:35:33 -05:00
siliconsandGitHub 9f66163d4f Merge pull request #12828 from Owai-Seek/foodport-p2-7/12/20
Ports several food sprites/foods from Baystation/Citadel RP
2020-07-23 10:35:30 -07:00
siliconsandGitHub ec72015f4f Merge pull request #12809 from BlackMajor/borgo
Gripper brained. The medborg can do chemistry now, oh no.
2020-07-23 10:35:16 -07:00
siliconsandGitHub 55754023ba Update gas_mixture.dm 2020-07-23 10:32:21 -07:00
CitadelStationBot 278c913976 Automatic changelog generation for PR #12869 [ci skip] 2020-07-23 12:29:46 -05:00
siliconsandGitHub dad3d38933 Merge pull request #12869 from timothyteakettle/zombies-rework
the very much needed zombie buffs
2020-07-23 10:29:43 -07:00
CitadelStationBot b623fb1699 Automatic changelog generation for PR #12867 [ci skip] 2020-07-23 12:29:33 -05:00
siliconsandGitHub 3c5aa67eef Merge pull request #12867 from EmeraldSundisk/omega717
Expands OmegaStation's medical wing.
2020-07-23 10:29:29 -07:00
CitadelStationBot b9ab8d0347 Automatic changelog generation for PR #12866 [ci skip] 2020-07-23 12:29:22 -05:00
siliconsandGitHub 9392eb3bb1 Merge pull request #12866 from Sneakyrat6/snaxiTypo
Fixes Snaxi DMM Typos
2020-07-23 10:29:19 -07:00
CitadelStationBot bb1056b8fd Automatic changelog generation for PR #12860 [ci skip] 2020-07-23 12:29:13 -05:00
siliconsandGitHub aeb6688bc7 Merge pull request #12860 from Sneakyrat6/burnablePhoto
Allows Photos to be Burned
2020-07-23 10:29:10 -07:00
CitadelStationBot 8231d2fbf1 Automatic changelog generation for PR #12861 [ci skip] 2020-07-23 12:28:56 -05:00