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
|
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 |
|
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
|
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
|
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 |
|
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
|
c0ac492d07
|
ok
|
2020-08-04 21:01:06 -07:00 |
|
Hatterhat
|
06f3eb5e80
|
wacky ass
|
2020-08-04 22:58:51 -05:00 |
|
silicons
|
d79cc5f85d
|
oof
|
2020-08-04 20:57:37 -07:00 |
|
silicons
|
0a137d2584
|
whew
|
2020-08-04 20:52:35 -07:00 |
|
Letter N
|
ed67801590
|
what if the tgui actualy recives it's topic?
|
2020-08-05 09:21:19 +08:00 |
|
zerothebigboy
|
1b367994b1
|
a
|
2020-08-04 20:48:17 -04:00 |
|
zerothebigboy
|
ff5efc7660
|
a
|
2020-08-04 20:48:08 -04:00 |
|
timothyteakettle
|
a3b3e23bac
|
fix ricochets
|
2020-08-04 23:41:55 +01:00 |
|
DeltaFire
|
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 |
|
DeltaFire
|
2a197af1c0
|
Merge remote-tracking branch 'upstream/master' into newnew-clock-misc-stuff
|
2020-08-04 17:30:38 +02:00 |
|
DeltaFire
|
276d35a693
|
moves a check a few lines
tin
|
2020-08-04 16:59:02 +02:00 |
|
TrilbySpaceClone
|
5d5459a318
|
Merge branch 'tea' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into tea
|
2020-08-04 10:07:10 -04:00 |
|
TrilbySpaceClone
|
f2e4b7eacc
|
grammer
|
2020-08-04 10:07:04 -04:00 |
|
Trilbyspaceclone
|
4ea05ab07e
|
Update drink_reagents.dm
|
2020-08-04 09:33:05 -04:00 |
|
TrilbySpaceClone
|
0f29235e6a
|
Tea Party
|
2020-08-04 09:15:44 -04:00 |
|
zerothebigboy
|
3b34c75b37
|
a
|
2020-08-04 07:25:30 -04:00 |
|
zerothebigboy
|
b44a329db1
|
a
|
2020-08-04 07:25:18 -04:00 |
|
Timothy Teakettle
|
ef53f3faea
|
the old system isnt needed really but sure i guess
|
2020-08-04 11:43:15 +01:00 |
|
zerothebigboy
|
25d2b1a3f1
|
a
|
2020-08-04 05:53:36 -04:00 |
|