Commit Graph

3700 Commits

Author SHA1 Message Date
Ghommie
188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Lin
293e6576c8 Merge pull request #10564 from kevinz000/optimization_1
Experimental optimizations
2020-01-29 19:25:13 +00:00
Ghom
7839724013 Merge pull request #10295 from Citadel-Station-13/kevinz000-patch-2
Brain surgery can now fix an abductee's mindsnap objectives
2020-01-29 05:34:49 +01:00
kevinz000
d3343a1e26 Merge pull request #10697 from Citadel-Station-13/Ghommie-patch-2
Makes transfer_ckey() less pedant.
2020-01-28 17:59:00 -07:00
kevinz000
3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527
Ported further runtime fixes by AnturK.
2020-01-28 17:57:26 -07:00
kevinz000
96df844aa3 Merge pull request #10754 from MalricB/Virgomangood
Reunites Shaggy (hair from virgo) with Scooby Terrowin
2020-01-28 17:56:11 -07:00
Putnam3145
209b681db1 Merge pull request #10706 from Ghommie/Ghommie-cit530
...? ...? (masked human mob examine pet peeve)
2020-01-27 19:02:13 -08:00
CygnusB
675e6cb9a6 Reunites Shaggy (hair from virgo) with Scooby Terrowin
self-insert baby pr florida man tries to merge his hair back into citadel
2020-01-27 15:51:38 -03: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
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
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
Ghommie
58c7c0291b ...? ...? 2020-01-25 05:22:05 +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
Ghommie
856ef236f3 Further runtime fixes by AnturK. 2020-01-24 23:01:30 +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
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
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
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
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
Ghommie
224146ee1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit444 2020-01-18 03:36:09 +01:00
Ghommie
9c0b78bc09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 01:23:08 +01:00
kevinz000
aea0de30d1 Merge pull request #10125 from Ghommie/Ghommie-cit449
Ports a few projectile code updates by ke:b:inz.
2020-01-17 15:15:08 -07:00