Commit Graph

2032 Commits

Author SHA1 Message Date
Ghommie
188f726ffd unicode support port wip 2020-01-31 05:32:00 +01: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
3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527
Ported further runtime fixes by AnturK.
2020-01-28 17:57:26 -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
Ghom
00667eeecd Merge pull request #10698 from Putnam3145/ghost-dojo-ban
Made ghost cafe mobs dust upon leaving, allowed ghost cafe bans
2020-01-25 15:25:26 +01:00
kevinz000
f199b720aa Merge pull request #10689 from Ghommie/Ghommie-cit524
Even more runtime fixes.
2020-01-25 05:54:20 -07:00
kevinz000
d502f6d6a8 Merge pull request #10670 from Seris02/sneezingnope
stops sneezing, sniffing, coughing, etc from doing anything if the affected person doesn't breathe
2020-01-24 16:16:03 -07:00
kevinz000
ac6695bd68 Merge pull request #10679 from Ghommie/Ghommie-cit517
neuter/plural gender fixes.
2020-01-24 16:15:44 -07:00
Ghommie
f6beadb494 missed this little one. 2020-01-24 23:45:50 +01:00
Ghommie
856ef236f3 Further runtime fixes by AnturK. 2020-01-24 23:01:30 +01:00
Putnam
11b5881721 wait no this should be 2 2020-01-24 09:15:43 -08:00
Putnam
0493db0ac6 allowed dojo banning, made dojo mobs dust upon leaving 2020-01-24 09:11:33 -08: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
kevinz000
f8ec01676a Merge pull request #10609 from Putnam3145/cold-blooded-buff
Moved cold-blooded to negative, made it cost -2
2020-01-24 00:22:08 -07:00
Ghommie
1ba4c19c64 A couple more. 2020-01-24 03:50:44 +01:00
Ghommie
78934c52fe A handful of runtime fixes. 2020-01-24 02:27:06 +01:00
Ghommie
56d31b0c8c neuter/plural gender fixes. 2020-01-23 22:50:30 +01:00
Seris02
5499638c5e yes 2020-01-23 15:41:49 +08:00
Ghom
047059617c Merge pull request #10645 from r4d6/Modular-Lavaland
Modularize the mining base
2020-01-23 02:53:34 +01:00
r4d6
e3cb379bde Add the Mining Base as a submap 2020-01-21 20:31:40 -05:00
kevinz000
b5ca546ac3 patch 2020-01-20 22:45:21 -07: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
Ghom
77911f9009 Merge pull request #10597 from Putnam3145/player-panel-can-reenter
Ghost role eligibility activation in player panel
2020-01-20 03:24:46 +01:00
kevinz000
088e586b47 Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-01-19 16:10:56 -07:00
Ghom
536900a7ac Merge pull request #10520 from Hatterhat/tg-40920
you like examining things? - port of tgstation 40920
2020-01-19 16:37:40 +01:00
Ghom
812182230f Merge pull request #10307 from Seris02/stunglasses
stunglasses
2020-01-19 16:35:47 +01:00
Putnam
cc1fcee4ac Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into one-more-dojo-tweak 2020-01-19 03:56:41 -08:00
Seris02
25d7af31a5 merge fixes 2020-01-19 16:36:04 +08:00
Putnam
3dc3f28748 Moved cold-blooded to negative, made it cost -2 2020-01-18 18:41:04 -08:00
Ghommie
072eca6ec0 fixes and more PRs 2020-01-18 23:01:00 +01:00
Ghommie
3ee855ab77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 22:14:06 +01:00
Ghom
d709edb1c2 Merge pull request #10578 from r4d6/Mining
Port TG's Mining changes
2020-01-18 20:32:14 +01:00
Putnam
95dc861ad8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into player-panel-can-reenter 2020-01-18 03:39:35 -08:00
Putnam
c612462b8c some demodularization + new eligibility stuff 2020-01-18 03:39:27 -08: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
keronshb
69b5164103 Merge branch 'master' into RemoteMoodResearch 2020-01-16 15:50:11 -05:00
r4d6
ce16c91b2f Code changes 2020-01-16 14:08:14 -05:00
Putnam
d29603ad77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-15 15:57:32 -08:00
Ghom
31c3b0f7bb Merge pull request #10415 from kevinz000/tg_update_1
Small controller/backend updates from /tg/
2020-01-15 15:23:09 +01:00
Ghommie
a0f35f5cfc Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 2020-01-14 00:55:28 +01:00
Ghommie
1d948907f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-13 23:26:21 +01:00
Ghom
3c4d36ddd3 Merge pull request #10478 from Seris02/gorillashuttlesstopping
Makes the gorilla shuttle emag only
2020-01-13 16:12:26 +01:00
Ghom
7af8579d17 Merge pull request #10550 from deathride58/fixestopicstatusproper
fixes status topic having a broken cooldown
2020-01-13 13:48:04 +01:00
Arturlang
f98bc85db0 Merge branch 'master' into mesmerize_quickfiz 2020-01-13 09:44:17 +02:00
Putnam
6197920101 fixed unnecessary typecheck 2020-01-12 23:40:28 -08:00
Artur
1b852b3a03 Fixes mesmerize 2020-01-13 09:34:40 +02:00
deathride58
e3a33ad8c1 fixes status topic having a broken cooldown 2020-01-13 00:56:05 -05:00
Putnam
c7e3b167e2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into one-more-dojo-tweak 2020-01-12 17:40:26 -08:00
Putnam
bb0d012d7a well that works 2020-01-12 16:08:49 -08:00
Ghommie
f45f979c27 Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 2020-01-12 23:21:03 +01:00