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 |
|
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 |
|
Timothy Teakettle
|
4429c4615b
|
no gibbies please
|
2020-08-05 22:58:15 +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 |
|
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 |
|
silicons
|
d79cc5f85d
|
oof
|
2020-08-04 20:57:37 -07:00 |
|
silicons
|
0a137d2584
|
whew
|
2020-08-04 20:52:35 -07:00 |
|
silicons
|
bbcc36bdec
|
ok
|
2020-08-03 22:31:31 -07:00 |
|
Letter N
|
454baea55f
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-08-04 09:31:34 +08:00 |
|
silicons
|
a4132c04ea
|
Merge pull request #12894 from timothyteakettle/wounds-part-2
port of wounds part 2
|
2020-08-03 14:43:07 -07:00 |
|
silicons
|
42db990836
|
why am i doing this
|
2020-08-03 13:37:37 -07:00 |
|
silicons
|
db8abc006a
|
Merge pull request #13010 from Seris02/fixeslizards
lizards no longer break their spines ~~roundstart~~ EVER AGAIN I FUCKING FIXED THE DOUBLE SET_SPECIES LIZARD BUG
|
2020-08-03 12:54:00 -07:00 |
|
Trilbyspaceclone
|
e1e6198140
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-03 10:53:08 -04:00 |
|
Seris02
|
82790cffed
|
fixes lizard code
|
2020-08-03 21:39:11 +08:00 |
|
Letter N
|
b30607b759
|
ayys update - ordering shit
|
2020-08-03 21:37:11 +08:00 |
|
Letter N
|
9a9e3ffef5
|
fixfixfix squared. Will not fix missing clockslab tabs, you just have to give it a category.
|
2020-08-03 21:14:17 +08:00 |
|
silicons
|
d5a19ea4b2
|
Merge pull request #13004 from zeroisthebiggay/tailwagfuckyou
prefs for headpat wagging
|
2020-08-03 02:30:57 -07:00 |
|
Seris02
|
aeec3a3404
|
lizards no longer have broken spines
|
2020-08-03 17:29:32 +08:00 |
|
zerothebigboy
|
d3cfa47d65
|
a
|
2020-08-02 22:27:42 -04:00 |
|
zerothebigboy
|
2d4127a9a7
|
a
|
2020-08-02 22:26:45 -04:00 |
|
zerothebigboy
|
35c5c2f4cd
|
a
|
2020-08-02 22:17:44 -04:00 |
|
Lin
|
2885b861f2
|
Merge pull request #12954 from silicons/killer_queen
bomb stands now use components
|
2020-08-02 12:52:07 -05:00 |
|
Timothy Teakettle
|
289c186f32
|
Merge remote-tracking branch 'upstream/master' into wounds-part-2
|
2020-08-02 18:11:07 +01:00 |
|
Timothy Teakettle
|
03d01d917f
|
Merge branch 'master' into wounds-part-2
|
2020-08-02 18:10:31 +01:00 |
|
silicons
|
06f5ce6401
|
buffs shoving (#12925)
* ^w^
* ok
* ok
|
2020-08-02 18:30:09 +02:00 |
|
zerothebigboy
|
aa782f1105
|
a
|
2020-08-02 02:27:24 -04:00 |
|
zerothebigboy
|
34a8d8f798
|
a
|
2020-08-02 01:38:23 -04:00 |
|
silicons
|
25d1fb761a
|
Merge remote-tracking branch 'citadel/master' into killer_queen
|
2020-08-01 20:51:38 -07:00 |
|
silicons
|
3fa35e4fa6
|
fix
|
2020-08-01 20:49:31 -07:00 |
|
silicons
|
2230a3665a
|
Merge pull request #12965 from timothyteakettle/end-our-suffering
drastically lowers the damage-related benefits of combat mode
|
2020-08-01 03:33:43 -07:00 |
|
silicons
|
d1edbab264
|
Update life.dm
|
2020-07-31 14:39:40 -07:00 |
|
Lin
|
16fb4b3291
|
Merge pull request #12964 from timothyteakettle/monkeys-bleed-a-lot
monkeys stop bleeding nonstop
|
2020-07-31 14:21:57 -05:00 |
|
silicons
|
3a773809b6
|
Update guardian.dm
|
2020-07-31 00:22:46 -07:00 |
|
Letter N
|
b376a6b6c4
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-07-30 14:43:52 +08:00 |
|
Letter N
|
0805265412
|
yet another batch. MAJOR: APC
|
2020-07-30 12:54:53 +08:00 |
|
silicons
|
b8522a2ae0
|
ok
|
2020-07-29 20:04:47 -07:00 |
|
timothyteakettle
|
caaedce6e2
|
end our suffering
|
2020-07-30 02:33:39 +01:00 |
|
timothyteakettle
|
55be55ce0f
|
Revert "end our suffering"
This reverts commit 4e1fcc4e08.
|
2020-07-30 02:29:13 +01:00 |
|
timothyteakettle
|
4e1fcc4e08
|
end our suffering
|
2020-07-30 02:28:53 +01:00 |
|
timothyteakettle
|
940fe8240d
|
monkey blood fix
|
2020-07-30 01:57:09 +01:00 |
|
silicons
|
c60e595d99
|
Merge pull request #12955 from Arturlang/bloodsucker_life
Plugs bloodsucker LifeTick into BiologicalLife
|
2020-07-29 14:02:22 -07:00 |
|
Timothy Teakettle
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
silicons
|
78312c23bf
|
sigh
|
2020-07-28 21:53:07 -07:00 |
|
Lin
|
a5dd08a054
|
Merge pull request #12734 from silicons/shoelaces
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
|
2020-07-28 21:51:43 -05:00 |
|