kevinz000
|
d17472b8f2
|
Update species.dm
|
2020-01-26 22:00:19 -07:00 |
|
Seris02
|
e45cc4933c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup
|
2020-01-27 08:33:38 +08:00 |
|
Seris02
|
0d1e458e9c
|
yuh
|
2020-01-27 08:32:45 +08:00 |
|
kevinz000
|
9292ff1972
|
Update damage_procs.dm
|
2020-01-26 13:27:54 -07:00 |
|
r4d6
|
31dd1bc69f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Dwarven_Language
|
2020-01-26 14:23:16 -05:00 |
|
r4d6
|
ac84ad803a
|
Add dwarf language
|
2020-01-26 14:22:21 -05:00 |
|
Ghom
|
9aca79a640
|
Merge pull request #10466 from Citadel-Station-13/kevinz000-patch-10
Makes monkey gorrilize on radiation easier to achieve
|
2020-01-26 05:50:15 +01:00 |
|
kevinz000
|
dc3e5e24fd
|
Merge remote-tracking branch 'citadel/master' into the-p-o-o-l
|
2020-01-25 19:36:06 -07:00 |
|
kevinz000
|
603ab65ed1
|
Merge pull request #10151 from Ghommie/Ghommie-cit450
refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
|
2020-01-25 19:33:26 -07:00 |
|
kevinz000
|
443f1716e1
|
Merge remote-tracking branch 'citadel/master' into the-p-o-o-l
|
2020-01-25 17:04:37 -07:00 |
|
kevinz000
|
2acb52fb56
|
Merge pull request #10690 from Ghommie/Ghommie-cit525
Additional runtime fixes.
|
2020-01-25 05:54:35 -07:00 |
|
kevinz000
|
f199b720aa
|
Merge pull request #10689 from Ghommie/Ghommie-cit524
Even more runtime fixes.
|
2020-01-25 05:54:20 -07:00 |
|
kevinz000
|
a5404f6063
|
Merge pull request #10687 from Ghommie/Ghommie-cit523
A few more, ported, runtime fixes.
|
2020-01-25 05:54:03 -07:00 |
|
kevinz000
|
72cfd35438
|
Merge pull request #10684 from Ghommie/Ghommie-cit521
fix for hypospray jank.
|
2020-01-25 05:53:42 -07:00 |
|
kevinz000
|
742588c7e4
|
spacing
|
2020-01-24 23:09:26 -07:00 |
|
kevinz000
|
fec5cf1362
|
optimizations
|
2020-01-24 22:08:36 -07:00 |
|
kevinz000
|
1877f6d0f5
|
unused list
|
2020-01-24 21:48:38 -07:00 |
|
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 |
|
Seris02
|
9761d68f4b
|
more merge conflict fixes
|
2020-01-24 10:14:31 +08: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 |
|