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
add3be1654
Merge pull request #13038 from Sishen1542/blorble
...
adds *blorble and *blurp as carbon emotes
2020-08-06 19:36:38 -07:00
60b93386a1
Merge pull request #13043 from Sishen1542/boneless
...
🅱️ oneless
2020-08-06 19:35:56 -07:00
c07495d940
Merge branch 'master' into ok-listen-its-an-accident
2020-08-06 18:39:51 +01:00
865a2bf181
Merge pull request #13030 from Citadel-Station-13/silicons-patch-71
...
off balanace
2020-08-06 12:32:50 -05:00
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
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
ea97e98b5c
Update _vending.dm ( #13035 )
2020-08-06 18:04:03 +02:00
72af083266
Update photosynthesis.dm ( #13032 )
2020-08-06 18:02:50 +02:00
4fa23feb04
🅱️ oneless
2020-08-05 19:16:10 -06:00
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
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
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
ede59e5c4d
Merge pull request #13021 from silicons/salt_pr
...
gives ipcs silicon sound emotes
2020-08-05 19:43:54 -05:00
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
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
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
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
57be216251
Merge pull request #12995 from timothyteakettle/travelling-traders
...
a few small tweaks to travelling traders
2020-08-05 15:28:15 -07:00
ed5aa7c9f7
Merge pull request #12994 from kappa-sama/patch-37
...
removes dildo
2020-08-05 15:27:29 -07:00
bb8dfa9236
Merge pull request #12991 from b1tt3r1n0/I'mAlreadyTracer
...
I wanna be tracer
2020-08-05 15:26:37 -07:00
f5f0d6be81
Merge pull request #12990 from timothyteakettle/tongue-patch
...
make tongue preference pass through cloning
2020-08-05 15:26:04 -07:00
4720fedce9
Merge pull request #13003 from Hatterhat/crusher-glaive
...
Proto-Kinetic Glaives - a crusher reskin
2020-08-05 15:25:48 -07:00
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
2d697e1867
Merge pull request #12926 from GlitchyCore/master
...
Adds a new fun round end sound
2020-08-05 15:14:20 -07:00
add9d5d0a0
Merge pull request #12889 from timothyteakettle/quirks-are-dumb
...
minor quirk changes
2020-08-05 15:13:52 -07:00
b2052a16cb
Merge pull request #13008 from zeroisthebiggay/powercreepislife
...
nukies can buy holoparasites not including support ones
2020-08-05 15:13:13 -07:00
f3e0255f7f
Merge pull request #13009 from Ludox235/ai-screams
...
Total law changes: 110
2020-08-05 15:12:53 -07:00
ffe3eeecde
Merge pull request #13017 from Hatterhat/coor-dharges
...
door charges no longer unconscious() you
2020-08-05 15:09:14 -07:00
9b14dff46b
Merge pull request #13025 from Trilbyspaceclone/tea
...
Tea Party
2020-08-05 15:07:55 -07:00
4429c4615b
no gibbies please
2020-08-05 22:58:15 +01:00
e07875b356
reduces all cuts bleed rate by 25%
2020-08-05 19:11:09 +01:00
92be50c252
blorbl
2020-08-05 09:28:34 -06:00
61ed83027d
asj
2020-08-05 18:40:33 +10:00
810962c633
Update blood.dm
2020-08-05 01:29:51 -07:00
3e2ab66afa
Update shields.dm
2020-08-04 21:34:59 -07:00
c0ac492d07
ok
2020-08-04 21:01:06 -07:00
d79cc5f85d
oof
2020-08-04 20:57:37 -07:00
0a137d2584
whew
2020-08-04 20:52:35 -07:00
831ea372f8
buncha stuff
...
adds a check if the sigil is already busy which I forgot before, makes the brass claw wounds-2 compartible and changes some misc stuff
2020-08-04 17:33:57 +02:00
2a197af1c0
Merge remote-tracking branch 'upstream/master' into newnew-clock-misc-stuff
2020-08-04 17:30:38 +02:00
276d35a693
moves a check a few lines
...
tin
2020-08-04 16:59:02 +02:00
5d5459a318
Merge branch 'tea' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into tea
2020-08-04 10:07:10 -04:00
f2e4b7eacc
grammer
2020-08-04 10:07:04 -04:00
4ea05ab07e
Update drink_reagents.dm
2020-08-04 09:33:05 -04:00
0f29235e6a
Tea Party
2020-08-04 09:15:44 -04:00
bbcc36bdec
ok
2020-08-03 22:31:31 -07:00
4df9efb076
heho attack text
2020-08-04 00:29:30 -05:00
6420914290
k
2020-08-03 23:45:34 -05:00
silicons