shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,860 Commits 5 Branches 0 Tags
71f44a7085ec0db6dc30afb5bce453450f762d17
Commit Graph

1005 Commits

Author SHA1 Message Date
kevinz000 75d3a8b35d Merge pull request #10868 from Citadel-Station-13/Ghommie-patch-4 
Holofans visual tweak.
 2020-02-06 00:42:39 -07:00
kevinz000 97583bd98f Merge pull request #10853 from Ghommie/Ghommie-cit549 
A PR about runtime errors
 2020-02-04 03:20:34 -07:00
Ghom ccd557122c Update holosign.dm 2020-02-03 08:35:47 +01:00
Ghom f2fd48bfd9 Update holosign.dm 2020-02-03 08:31:12 +01:00
kevinz000 341430eab5 Merge pull request #10836 from Hatterhat/rcd-carts-engifab 
adding stuff to techfabs - RCD carts, combifans
 2020-02-02 16:30:59 -07:00
Ghom 96a38e6c18 Merge pull request #10837 from Owai-Seek/tinytweaks 
Tweaking Chef Vendor, Blood Crate, and Cake Recipe
 2020-02-02 18:07:25 +01:00
Artur e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
kevinz000 33577e0d82 Merge pull request #10813 from Ghommie/Ghommie-cit540 
Unicode support updates from tgstation.
 2020-02-02 01:47:24 -07:00
kevinz000 2cdf7fa0bb Merge pull request #10784 from Seris02/polycoats 
polychromic winter coats
 2020-02-02 01:46:58 -07:00
Ghommie fedb05b3be A PR about runtime errors 2020-02-02 05:43:38 +01:00
Hatterhat e985d21ea3 fucking combifan 2020-02-01 20:23:01 -06:00
Winter Flare 59b5b0b9a6 A bunch of tiny tweaks. 
Added additional blood types to blood crate.
Added Soy Sauce packet.
Added Soy Sauce and BBQ packet to chef vendor.
Changed Birthday Cake recipie to mirror TG.
 2020-02-01 04:49:56 -05:00
Trilbyspaceclone 4b7e5916bf Update crates.dm 2020-02-01 01:09:35 -05: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
Seris02 dbb6218e0d merp 2020-01-30 14:54:07 +08: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 a1a2d45be6 Update closets.dm 2020-01-28 02:41:04 -07:00
Ghom 5fd81c5233 Merge pull request #10717 from Putnam3145/meow-mix-fix 
Makes "Meow Mix" bar sign actually appear
 2020-01-26 05:45:55 +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
Putnam b36d2dc277 Makes "Meow Mix" bar sign actually appear 2020-01-25 13:56:25 -08: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 a5404f6063 Merge pull request #10687 from Ghommie/Ghommie-cit523 
A few more, ported, runtime fixes.
 2020-01-25 05:54:03 -07:00
kevinz000 26459a156d Merge pull request #10682 from Ghommie/Ghommie-cit519 
Ports "Makes falsewall hide pipes and wires"
 2020-01-25 05:53:07 -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
Putnam 0493db0ac6 allowed dojo banning, made dojo mobs dust upon leaving 2020-01-24 09:11:33 -08:00
Ghommie bd6e364612 But wait, there is more! 
No...
 2020-01-24 04:33:55 +01:00
Ghommie 721fd108f9 A few more, ported, runtime fixes. 2020-01-24 03:02:07 +01:00
Ghommie 8e5f221bb9 Ports "Makes falsewall hide pipes and wires" 2020-01-24 00:57:27 +01:00
Ghommie 56d31b0c8c neuter/plural gender fixes. 2020-01-23 22:50:30 +01:00
kevinz000 88f625edfc Merge pull request #10636 from Ghommie/Ghommie-cit512 
Trilby's solar panels PR but improved.
 2020-01-23 04:35:13 -07:00
Ghommie ddf037da92 Trilby's solar panels PR but improved. 2020-01-21 00:28:41 +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 8b21a60ac9 MF Line endings 2020-01-20 14:09:22 +02:00
Artur f5ad854c2c Conflict fix 2020-01-20 13:50:52 +02: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
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
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
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
r4d6 ce16c91b2f Code changes 2020-01-16 14:08:14 -05:00
Artur 6500d0d9a9 Fixes ghost role descriptions 2020-01-16 13:43:21 +02:00
Artur 8b8a112d2c Ohkay 2020-01-15 09:41:33 +02: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
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 9dad810edf Merge branch 'Ghommie-cit492' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit492 2020-01-12 23:11:02 +01:00