Artur
|
e7ddfdd8d8
|
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
|
2020-02-02 13:31:54 +01:00 |
|
kevinz000
|
66a2216ef3
|
Merge pull request #10829 from Ghommie/Ghommie-cit544
Fixed and brutalized clown op slippery weapons a little.
|
2020-02-02 03:16:23 -07:00 |
|
kevinz000
|
33577e0d82
|
Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
|
2020-02-02 01:47:24 -07:00 |
|
Ghom
|
d6c36f363e
|
Merge pull request #10817 from IronEleven/ViroStatPort
Updates Virus Symptom Stats to Match TG
|
2020-02-02 01:41:11 +01:00 |
|
Ghom
|
f6e30ee6aa
|
Merge pull request #10841 from Kraseo/boxing
Fixes being able to pull after wearing boxing gloves
|
2020-02-01 19:13:30 +01:00 |
|
Ghom
|
d19b7a7695
|
Merge pull request #10744 from r4d6/Moar-Engines
Moar engines!
|
2020-02-01 19:11:10 +01:00 |
|
Kraseo
|
d70665a0c3
|
got asked to do this
|
2020-02-01 19:03:35 +01:00 |
|
Kraseo
|
aa2e4299e2
|
my grug brain took more than 10 attempts to get this to work
|
2020-02-01 18:51:18 +01:00 |
|
Ghom
|
051811ed46
|
Merge pull request #10811 from Arturlang/crafting_componitization
[READY]Ports TG updates to crafting and componentizes it
|
2020-02-01 18:36:51 +01:00 |
|
Putnam3145
|
33122d0d92
|
Merge branch 'master' into TGUIs_Nexties
|
2020-02-01 00:49:10 -08:00 |
|
Ghommie
|
07b6d278a1
|
fixed and brutalized clown op slippery weapons a little.
|
2020-02-01 04:48:40 +01:00 |
|
Ghom
|
5257ab2e00
|
Merge pull request #10559 from Seris02/custompie
custom reagent pie smite
|
2020-02-01 01:46:15 +01:00 |
|
IronEleven
|
fa7b38d3bd
|
Stat Changes
Changes symptom stats to match tg
|
2020-01-31 19:03:30 -05:00 |
|
IronEleven
|
d2e6f4abf0
|
Comment Typo Fix
Might as well fix that while I'm in here
|
2020-01-31 19:02:59 -05:00 |
|
Artur
|
8bb0e30036
|
Initial Commit V3
|
2020-01-31 18:17:14 +01:00 |
|
Ghommie
|
188f726ffd
|
unicode support port wip
|
2020-01-31 05:32:00 +01:00 |
|
Arturlang
|
83ce84cdc4
|
Merge branch 'master' into TGUIs_Nexties
|
2020-01-30 20:46:20 +02: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 |
|
r4d6
|
ad55c7235d
|
I knew I forgot something
|
2020-01-26 21:21:26 -05:00 |
|
r4d6
|
09448b86e3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Moar-Engines
|
2020-01-26 20:58:37 -05:00 |
|
r4d6
|
4884165d4f
|
Add TEG, Code & config
|
2020-01-26 20:58:16 -05: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 |
|
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 |
|
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 |
|
Artur
|
255f2ce449
|
Testmerge Conflict fix?
|
2020-01-22 20:17:42 +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 |
|
Artur
|
8b21a60ac9
|
MF Line endings
|
2020-01-20 14:09:22 +02:00 |
|
Artur
|
f5ad854c2c
|
Conflict fix
|
2020-01-20 13:50:52 +02: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 |
|