Commit Graph
36589 Commits
Author SHA1 Message Date
siliconsandGitHub 181de55685 Update miscellaneous.dm 2020-08-06 21:30:31 -07:00
CitadelStationBot 7e4f172ba5 Automatic changelog generation for PR #12992 [ci skip] 2020-08-06 21:40:13 -05:00
siliconsandGitHub 6876edbd85 Merge pull request #12992 from Hatterhat/rifle-book-pt2
unatomic as shit PR about nukie guns
2020-08-06 19:40:09 -07:00
CitadelStationBot e9e4cae5c3 Automatic changelog generation for PR #13013 [ci skip] 2020-08-06 21:37:34 -05:00
siliconsandGitHub 009f0ebeeb Merge pull request #13013 from DeltaFire15/newnew-clock-misc-stuff
N tvsg sebz Nezbere (or: a bunch of clockcult related stuff)
2020-08-06 19:37:30 -07:00
CitadelStationBot 546f4d63a8 Automatic changelog generation for PR #13038 [ci skip] 2020-08-06 21:36:41 -05:00
siliconsandGitHub add3be1654 Merge pull request #13038 from Sishen1542/blorble
adds *blorble and *blurp as carbon emotes
2020-08-06 19:36:38 -07:00
CitadelStationBot 459368689a Automatic changelog generation for PR #13043 [ci skip] 2020-08-06 21:35:59 -05:00
siliconsandGitHub 60b93386a1 Merge pull request #13043 from Sishen1542/boneless
🅱️oneless
2020-08-06 19:35:56 -07:00
CitadelStationBot 489fa9ad97 Automatic changelog generation for PR #13041 [ci skip] 2020-08-06 21:35:34 -05:00
siliconsandGitHub dafa444240 Merge pull request #13041 from Ludox235/more-abductee-shit
No murderbone please
2020-08-06 19:35:31 -07:00
CitadelStationBot 24c83f70ca Automatic changelog generation for PR #13039 [ci skip] 2020-08-06 21:35:21 -05:00
siliconsandGitHub 977db69e92 Merge pull request #13039 from timothyteakettle/ok-listen-its-an-accident
reduces all cuts bleed rate by 25% and stops blood gibbing you
2020-08-06 19:35:18 -07:00
Changelogs 3a39f76ece Automatic changelog compile [ci skip] 2020-08-07 00:12:42 +00:00
Timothy TeakettleandGitHub c07495d940 Merge branch 'master' into ok-listen-its-an-accident 2020-08-06 18:39:51 +01:00
CitadelStationBot 3c7b33446d Automatic changelog generation for PR #13026 [ci skip] 2020-08-06 12:35:39 -05:00
LinandGitHub c97aa49c12 Merge pull request #13026 from dapnee/active-turfs-DIE
More Active Turf Fixes
2020-08-06 12:35:35 -05:00
CitadelStationBot f91a64d1cd Automatic changelog generation for PR #13030 [ci skip] 2020-08-06 12:32:54 -05:00
LinandGitHub 865a2bf181 Merge pull request #13030 from Citadel-Station-13/silicons-patch-71
off balanace
2020-08-06 12:32:50 -05:00
CitadelStationBot 024f8d6975 Automatic changelog generation for PR #13033 [ci skip] 2020-08-06 12:31:47 -05:00
LinandGitHub ad77a6120a Merge pull request #13033 from Citadel-Station-13/silicons-patch-72
how about we not gib slimepeople for having too much blood that is a little unfun eh now they'll just take damage and bleed the excess
2020-08-06 12:31:43 -05:00
CitadelStationBot f4d0fca6ea Automatic changelog generation for PR #13029 [ci skip] 2020-08-06 12:31:29 -05:00
LinandGitHub dafe9b6a38 Merge pull request #13029 from silicons/textwallers
attempting to send an emote above 2048 characters will now reflect it back to you without sending instead of rudely cutting off your emote mid-message.
2020-08-06 12:31:25 -05:00
CitadelStationBot bf2e7aad56 Automatic changelog generation for PR #13035 [ci skip] 2020-08-06 11:04:07 -05:00
lolman360andGitHub ea97e98b5c Update _vending.dm (#13035) 2020-08-06 18:04:03 +02:00
CitadelStationBot 79c4382b75 Automatic changelog generation for PR #13032 [ci skip] 2020-08-06 11:02:53 -05:00
lolman360andGitHub 72af083266 Update photosynthesis.dm (#13032) 2020-08-06 18:02:50 +02:00
Sishen 4fa23feb04 🅱️ oneless 2020-08-05 19:16:10 -06:00
LinandGitHub 32805fc7c2 Merge pull request #12996 from silicons/typing_indicators_fix
fixes typing indicators being stuck (maybe) by using mutable appearances instead of iconstates.
2020-08-05 20:02:29 -05:00
Ludox d4f76917e4 No murderbone please 2020-08-06 02:52:29 +02:00
CitadelStationBot 83fb1118c0 Automatic changelog generation for PR #13001 [ci skip] 2020-08-05 19:51:00 -05:00
LinandGitHub ad4a96c73a Merge pull request #13001 from Citadel-Station-13/silicons-patch-66
makes explosions only recurse one level into storage at full power before dropping 1 level per storage object recursed
2020-08-05 19:50:57 -05:00
CitadelStationBot 2a9ddbcc08 Automatic changelog generation for PR #12969 [ci skip] 2020-08-05 19:48:41 -05:00
LinandGitHub 0ff5c90fc8 Merge pull request #12969 from silicons/e
someone asked i code holoparasites playing music so here we are???
2020-08-05 19:48:37 -05:00
LinandGitHub ede59e5c4d Merge pull request #13021 from silicons/salt_pr
gives ipcs silicon sound emotes
2020-08-05 19:43:54 -05:00
LinandGitHub c310b1a70e Merge pull request #12997 from silicons/lavastaff
fixes medsprays, sutures/regenmesh, and lavastaves not respecting clickdelay (rip instant chemdump heal on self)
2020-08-05 19:43:38 -05:00
LinandGitHub 6884204edb Merge pull request #13000 from silicons/explosion_epicenter
makes the thing that ensures explosives in bags hit everything in said bag only work if it's actually in the bag (no more pda bombs erase your entire inventory)
2020-08-05 19:43:04 -05:00
CitadelStationBot 0f9f6f8ef9 Automatic changelog generation for PR #13006 [ci skip] 2020-08-05 19:42:31 -05:00
LinandGitHub bc2e97a2a4 Merge pull request #13006 from Citadel-Station-13/silicons-patch-68
2x's volumetric storage minimum size because i'm going to stop pretending this ugly shit is usable when even i myself use opt-out to old interface
2020-08-05 19:42:28 -05:00
Changelogs 4f46ec09f1 Automatic changelog compile [ci skip] 2020-08-06 00:12:03 +00:00
CitadelStationBot f5a5fdd111 Automatic changelog generation for PR #12963 [ci skip] 2020-08-05 17:44:51 -05:00
siliconsandGitHub 8442d69858 Merge pull request #12963 from Seris02/morefix
ghost chilis fixed
2020-08-05 15:44:48 -07:00
9b02b6619d Update code/modules/hydroponics/grown/chili.dm
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2020-08-06 06:44:17 +08:00
CitadelStationBot 9ce4972200 Automatic changelog generation for PR #12995 [ci skip] 2020-08-05 17:28:18 -05:00
siliconsandGitHub 57be216251 Merge pull request #12995 from timothyteakettle/travelling-traders
a few small tweaks to travelling traders
2020-08-05 15:28:15 -07:00
CitadelStationBot d381879b8c Automatic changelog generation for PR #12994 [ci skip] 2020-08-05 17:27:32 -05:00
siliconsandGitHub ed5aa7c9f7 Merge pull request #12994 from kappa-sama/patch-37
removes dildo
2020-08-05 15:27:29 -07:00
CitadelStationBot 6a61c17163 Automatic changelog generation for PR #12991 [ci skip] 2020-08-05 17:26:40 -05:00
siliconsandGitHub bb8dfa9236 Merge pull request #12991 from b1tt3r1n0/I'mAlreadyTracer
I wanna be tracer
2020-08-05 15:26:37 -07:00
CitadelStationBot 462346b55e Automatic changelog generation for PR #12990 [ci skip] 2020-08-05 17:26:07 -05:00