Commit Graph

24096 Commits

Author SHA1 Message Date
Lin
dea2dab536 Merge pull request #13055 from Citadel-Station-13/silicons-patch-78
squeaking objects including air horns and clockwork boots now have a default 1 second cooldown. squeaking objects crossing each other will on average only allow 3 squeaks to occur, because if byond is literally running out of sound channels you know the fun has went too far
2020-08-08 12:06:42 -05:00
Lin
13d94717f4 Merge pull request #13052 from Citadel-Station-13/silicons-patch-76
fixes laptops not being able to be picked up
2020-08-08 12:05:36 -05:00
Lin
f154623284 Merge pull request #13059 from Citadel-Station-13/silicons-patch-81
immovable rods no longer drop down chasms
2020-08-08 12:02:47 -05:00
Lin
f13b0df7fe Merge pull request #13057 from Citadel-Station-13/silicons-patch-79
Fixes telekinesis being able to be used to wield objects
2020-08-08 12:02:10 -05:00
silicons
795a1fab35 Merge pull request #13048 from Hatterhat/glaive-parry
Proto-Kinetic Glaives Phase 2 - Parrying
2020-08-07 17:29:57 -07:00
Hatterhat
fd8f3781cc test commit please ignore 2020-08-07 17:03:38 -05:00
Hatterhat
c227fc7546 wait, shit 2020-08-07 16:56:53 -05:00
silicons
36bdb9e482 Update twohanded.dm 2020-08-07 01:31:29 -07:00
silicons
94fa7e4fbb Update squeak.dm 2020-08-07 01:06:23 -07:00
silicons
e1e9b77b07 Update immovable_rod.dm 2020-08-07 00:36:04 -07:00
silicons
95607274e3 Update twohanded.dm 2020-08-07 00:19:02 -07:00
silicons
b80fe7013e Update twohanded.dm 2020-08-07 00:17:12 -07:00
silicons
aa5b99a9d4 make it end 2020-08-07 00:03:59 -07:00
silicons
4dd51f3d9c fix 2020-08-06 23:48:05 -07:00
silicons
72d0f2a4a3 AAAAAAAA 2020-08-06 23:43:14 -07:00
silicons
65839060c9 Fixes 2020-08-06 23:39:57 -07:00
silicons
3640a33ff6 e 2020-08-06 23:22:53 -07:00
silicons
bcfc601c7a sigh 2020-08-06 23:11:09 -07:00
silicons
8edb374a20 sigh 2020-08-06 23:09:02 -07:00
silicons
1586625e6b Merge pull request #12960 from timothyteakettle/loadout-you-say
loadout changes part 1: adds subcategories to the loadout
2020-08-06 21:59:13 -07:00
silicons
23880e284a Update squeak.dm 2020-08-06 21:48:01 -07:00
silicons
79313209c3 Update squeak.dm 2020-08-06 21:42:13 -07:00
silicons
10d23efa87 Update miscellaneous.dm 2020-08-06 21:38:35 -07:00
silicons
58a19ffe4b Update signals.dm 2020-08-06 21:38:11 -07:00
silicons
29228a9df4 Update squeak.dm 2020-08-06 21:36:53 -07:00
silicons
181de55685 Update miscellaneous.dm 2020-08-06 21:30:31 -07:00
timothyteakettle
e773062b9a reverse the loadout update 2020-08-07 03:58:19 +01:00
silicons
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
silicons
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
silicons
add3be1654 Merge pull request #13038 from Sishen1542/blorble
adds *blorble and *blurp as carbon emotes
2020-08-06 19:36:38 -07:00
silicons
60b93386a1 Merge pull request #13043 from Sishen1542/boneless
🅱️oneless
2020-08-06 19:35:56 -07:00
silicons
e9cbb550a1 Update laptop.dm 2020-08-06 18:09:50 -07:00
Timothy Teakettle
c07495d940 Merge branch 'master' into ok-listen-its-an-accident 2020-08-06 18:39:51 +01:00
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
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
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