Commit Graph

26370 Commits

Author SHA1 Message Date
Lin 865a2bf181 Merge pull request #13030 from Citadel-Station-13/silicons-patch-71
off balanace
2020-08-06 12:32:50 -05:00
Lin 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
Lin 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
TrilbySpaceClone 3ae10ac826 update? 2020-08-06 13:09:41 -04:00
lolman360 ea97e98b5c Update _vending.dm (#13035) 2020-08-06 18:04:03 +02:00
lolman360 72af083266 Update photosynthesis.dm (#13032) 2020-08-06 18:02:50 +02:00
Letter N 333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
Letter N 8f0f30f6f7 lazy datacore fix 2020-08-06 17:27:51 +08:00
silicons 2a0f2a38a7 Fix 2020-08-05 21:42:05 -07:00
silicons 815ddd1866 oh boy 2020-08-05 21:34:26 -07:00
Sishen 4fa23feb04 🅱️ oneless 2020-08-05 19:16:10 -06:00
Lin 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
Lin 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
Lin 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
Lin ede59e5c4d Merge pull request #13021 from silicons/salt_pr
gives ipcs silicon sound emotes
2020-08-05 19:43:54 -05:00
Lin 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
Lin 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
Lin 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
silicons 8442d69858 Merge pull request #12963 from Seris02/morefix
ghost chilis fixed
2020-08-05 15:44:48 -07:00
Seris02 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
silicons 57be216251 Merge pull request #12995 from timothyteakettle/travelling-traders
a few small tweaks to travelling traders
2020-08-05 15:28:15 -07:00
timothyteakettle 2001c589c4 fuck 2020-08-05 23:28:13 +01:00
timothyteakettle 4cc3ca2193 lets try that again 2020-08-05 23:27:47 +01:00
silicons ed5aa7c9f7 Merge pull request #12994 from kappa-sama/patch-37
removes dildo
2020-08-05 15:27:29 -07:00
silicons bb8dfa9236 Merge pull request #12991 from b1tt3r1n0/I'mAlreadyTracer
I wanna be tracer
2020-08-05 15:26:37 -07:00
silicons f5f0d6be81 Merge pull request #12990 from timothyteakettle/tongue-patch
make tongue preference pass through cloning
2020-08-05 15:26:04 -07:00
silicons 4720fedce9 Merge pull request #13003 from Hatterhat/crusher-glaive
Proto-Kinetic Glaives - a crusher reskin
2020-08-05 15:25:48 -07:00
silicons 164201ab27 Merge pull request #12956 from Arturlang/bloodsucker_death_lessspam
Makes bloodsucker death not spam now actually working
2020-08-05 15:15:30 -07:00
silicons 2d697e1867 Merge pull request #12926 from GlitchyCore/master
Adds a new fun round end sound
2020-08-05 15:14:20 -07:00
silicons add9d5d0a0 Merge pull request #12889 from timothyteakettle/quirks-are-dumb
minor quirk changes
2020-08-05 15:13:52 -07:00
silicons b2052a16cb Merge pull request #13008 from zeroisthebiggay/powercreepislife
nukies can buy holoparasites not including support ones
2020-08-05 15:13:13 -07:00
silicons f3e0255f7f Merge pull request #13009 from Ludox235/ai-screams
Total law changes: 110
2020-08-05 15:12:53 -07:00
silicons ffe3eeecde Merge pull request #13017 from Hatterhat/coor-dharges
door charges no longer unconscious() you
2020-08-05 15:09:14 -07:00
silicons 9b14dff46b Merge pull request #13025 from Trilbyspaceclone/tea
Tea Party
2020-08-05 15:07:55 -07:00
Timothy Teakettle 4429c4615b no gibbies please 2020-08-05 22:58:15 +01:00
Sishen ec8cd31950 funny chair loses block chance and gains active block/parry 2020-08-05 14:21:48 -06:00
Timothy Teakettle e07875b356 reduces all cuts bleed rate by 25% 2020-08-05 19:11:09 +01:00
Timothy Teakettle 6ba359e0a1 fix 2020-08-05 17:43:54 +01:00
Timothy Teakettle 14bc60955f unlocked 2020-08-05 16:31:27 +01:00
Sishen 92be50c252 blorbl 2020-08-05 09:28:34 -06:00
Timothy Teakettle f2c1b25119 yes 2020-08-05 15:50:25 +01:00
Timothy Teakettle 1f62a4bbf9 typo 2020-08-05 15:29:07 +01:00
Timothy Teakettle 8effb219e1 fix a bug and reduce it by 1 more line 2020-08-05 15:27:48 +01:00
Timothy Teakettle 5297700340 snowflake coders are bad 2020-08-05 14:11:40 +01:00
Letter N f2f6416105 fixes - radio, broken - crewmanifest, gastank controler 2020-08-05 20:34:09 +08:00
lolman360 61ed83027d asj 2020-08-05 18:40:33 +10:00
silicons 810962c633 Update blood.dm 2020-08-05 01:29:51 -07:00
silicons de3227e3e0 fix 2020-08-04 22:55:33 -07:00
silicons 0a36f9fbb5 changes 2020-08-04 22:40:28 -07:00
silicons 3e2ab66afa Update shields.dm 2020-08-04 21:34:59 -07:00