kevinz000
|
102252fb02
|
Undocumented change: toxloss blood penalty nerf. Sorry, love you slimefolks but put this back in another PR if you want.
|
2020-01-24 21:48:04 -07:00 |
|
kevinz000
|
45516f27a3
|
optimize lazylist length check
|
2020-01-24 21:36:22 -07:00 |
|
Ghommie
|
58c7c0291b
|
...? ...?
|
2020-01-25 05:22:05 +01:00 |
|
Ghommie
|
f2b04be561
|
More Runtimenator fixes.
|
2020-01-25 02:16:45 +01:00 |
|
kevinz000
|
ac6695bd68
|
Merge pull request #10679 from Ghommie/Ghommie-cit517
neuter/plural gender fixes.
|
2020-01-24 16:15:44 -07:00 |
|
kevinz000
|
147c0d8852
|
Merge pull request #10680 from Ghommie/Ghommie-cit518
snowflake-friendly towels.
|
2020-01-24 16:15:27 -07:00 |
|
Artur
|
e360ac1d36
|
Conflict fix
|
2020-01-24 23:06:32 +01:00 |
|
Ghommie
|
856ef236f3
|
Further runtime fixes by AnturK.
|
2020-01-24 23:01:30 +01:00 |
|
Ghommie
|
32ee2f6197
|
minor pet peeve with the anomalous honking crystal & co.
|
2020-01-24 21:51:24 +01:00 |
|
Ghommie
|
6fe0c57c42
|
run-extra-times fixes.
|
2020-01-24 20:48:32 +01:00 |
|
Ghom
|
d3531aade2
|
Makes transfer_ckey crash logging less pedant.
|
2020-01-24 17:06:38 +01:00 |
|
Ghom
|
f5d8e447eb
|
Merge pull request #10676 from Kraseo/virgohairs
Reorganises/fixes virgo hairs
|
2020-01-24 16:39:10 +01:00 |
|
kevinz000
|
bedb42f147
|
Merge remote-tracking branch 'citadel/master' into optimization_1
|
2020-01-24 03:41:40 -07:00 |
|
kevinz000
|
831ac91917
|
Merge pull request #10073 from Ghommie/Ghommie-cit435
Ports timestop and sepia extracts improvements/tweaks.
|
2020-01-24 00:25:53 -07:00 |
|
Ghommie
|
67f58b8a59
|
A few more runtime fixes.
|
2020-01-24 03:30:34 +01:00 |
|
Ghommie
|
721fd108f9
|
A few more, ported, runtime fixes.
|
2020-01-24 03:02:07 +01:00 |
|
Ghommie
|
78934c52fe
|
A handful of runtime fixes.
|
2020-01-24 02:27:06 +01:00 |
|
Ghommie
|
524f665f4a
|
fix for hypospray jank.
|
2020-01-24 02:17:41 +01:00 |
|
Ghommie
|
c8bf148216
|
snowflake-friendly towels.
|
2020-01-24 00:06:07 +01:00 |
|
Ghommie
|
56d31b0c8c
|
neuter/plural gender fixes.
|
2020-01-23 22:50:30 +01:00 |
|
Kraseo
|
14b7711590
|
i will end whoever ported virgo hairs and thought it was fine to do it like that
|
2020-01-23 17:29:21 +01:00 |
|
BlackMajor
|
77e7dff11b
|
Webedit PR man bad
|
2020-01-24 01:41:40 +13:00 |
|
BlackMajor
|
5fb2e60ebf
|
Merge branch 'master' into master
|
2020-01-24 00:50:46 +13:00 |
|
BlackMajor
|
7733d3f98a
|
Update robot_modules.dm
|
2020-01-24 00:42:41 +13:00 |
|
Artur
|
0091da8307
|
Linter fixes
|
2020-01-23 11:31:41 +02:00 |
|
Artur
|
19fcd89282
|
Shit
|
2020-01-23 11:31:41 +02:00 |
|
Seris02
|
934c8fe533
|
updates + thingamajig
|
2020-01-23 15:25:45 +08:00 |
|
TrilbySpaceClone
|
86ea13afeb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into patch-270
|
2020-01-22 23:00:54 -05:00 |
|
Ghom
|
bf62563507
|
Merge pull request #10410 from CameronWoof/free-the-lizard
Humans and anthromorphs can now use lizard tails.
|
2020-01-23 03:06:52 +01:00 |
|
Artur
|
255f2ce449
|
Testmerge Conflict fix?
|
2020-01-22 20:17:42 +01:00 |
|
Trilbyspaceclone
|
ebb6ac1d7b
|
more words
|
2020-01-22 11:33:39 -05:00 |
|
Trilbyspaceclone
|
bc1500c04c
|
Update cleanbot.dm
|
2020-01-21 18:33:04 -05:00 |
|
kevinz000
|
b5ca546ac3
|
patch
|
2020-01-20 22:45:21 -07:00 |
|
Seris02
|
74be93a8cc
|
hasSiliconAccessInArea vars change
|
2020-01-21 11:44:49 +08:00 |
|
Seris02
|
c2bcbe868e
|
merge conflicts + getting rid of commented code for now
|
2020-01-21 11:23:33 +08:00 |
|
Ghom
|
7a3f0d140c
|
Merge pull request #10468 from Citadel-Station-13/stop-ghosting
ghosting no longer makes it so you don't count for abductors
|
2020-01-21 02:26:25 +01:00 |
|
Ghom
|
038f5e4b0e
|
Yea, sorry for being so naive right now.
|
2020-01-20 21:59:12 +01:00 |
|
Ghom
|
a921b27c63
|
I want a different maintainer to merge this now.
|
2020-01-20 21:58:21 +01:00 |
|
Ghommie
|
9604b27482
|
github web editor is so bad
|
2020-01-20 21:55:02 +01:00 |
|
Ghom
|
5500e349e3
|
Merge branch 'master' into kevinz000-patch-10
|
2020-01-20 21:48:28 +01:00 |
|
Ghom
|
9ea6e896fb
|
Kevinz, please.
|
2020-01-20 21:43:00 +01:00 |
|
Ghommie
|
5644617786
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450
|
2020-01-20 20:59:38 +01:00 |
|
Artur
|
f5ad854c2c
|
Conflict fix
|
2020-01-20 13:50:52 +02:00 |
|
Seris02
|
a100f9382e
|
better, there, happy now github
|
2020-01-20 14:51:53 +08:00 |
|
kevinz000
|
5d485a95c3
|
Merge remote-tracking branch 'citadel/master' into the-p-o-o-l
|
2020-01-19 20:25:51 -07:00 |
|
kevinz000
|
65eaf9787a
|
Merge pull request #10097 from Ghommie/Ghommie-cit444
Made traitor kevlar/armor padding accessories examine-proof.
|
2020-01-19 16:58:27 -07:00 |
|
Ghommie
|
072eca6ec0
|
fixes and more PRs
|
2020-01-18 23:01:00 +01:00 |
|
Seris02
|
fdf3871cb7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup
|
2020-01-18 18:30:51 +08:00 |
|
Seris02
|
04b34ec8ed
|
hijack implant
|
2020-01-18 18:04:31 +08:00 |
|
Putnam
|
a8569fa7e5
|
Makes it so that opting out of ass slapping is OPT OUT
|
2020-01-17 21:31:23 -08:00 |
|