shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,291 Commits 5 Branches 0 Tags
59b5b0b9a65f1c09adc60a3cd61ce021a3c33834
Commit Graph

985 Commits

Author SHA1 Message Date
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
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
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
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
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
Ghommie
b2ab8959f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit492 2020-01-12 23:00:05 +01:00
Ghommie
c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
Ghommie
02fbbd4f95 Ouch. 2020-01-12 16:54:08 +01:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghom
34502cab1d Merge pull request #10247 from Seris02/atmosfirelock 
ATMOS Firelocks and more
 2020-01-11 15:29:25 +01:00
Ghom
5dc598e2ea Merge pull request #10465 from Putnam3145/more-dojo-tweaks 
More ghost dojo tweaks
 2020-01-11 15:03:45 +01:00
Putnam
312da86424 Suggested changes 2020-01-11 01:28:49 -08:00
Lin
147d948ad8 Merge pull request #10498 from Citadel-Station-13/kevinz000-patch-13 
reduces table cooldown to 0.4
 2020-01-10 23:55:07 +00:00
Lin
e5e2e4f012 Merge pull request #10329 from Ghommie/Ghommie-cit490 
Ports reagents id removal and typepath usage.
 2020-01-10 01:34:39 +00:00
Lin
c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447 
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
 2020-01-10 01:31:20 +00:00
Ghommie
825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00
kevinz000
52a0f5779d Update tables_racks.dm 2020-01-09 15:20:57 -08:00
kevinz000
dbd2cb6195 Merge pull request #10467 from Seris02/boxfix 
stops lightspeed spessmen in boxes
 2020-01-08 13:31:55 -08:00
kevinz000
b68f81f4e6 Merge pull request #10452 from Ghommie/Ghommie-cit499 
Fixes lattice's examine.
 2020-01-08 13:30:37 -08:00
Putnam
19887691f3 added deadchat toggle to dojo mobs too 2020-01-07 04:39:04 -08:00
Seris02
5fae814e42 did it thanks 2020-01-07 17:52:46 +08:00
Putnam
6f6f0cbb62 Tweaks to ghost dojo 2020-01-06 23:33:29 -08:00
Lin
2ce3b7fbf5 Merge pull request #10455 from Ghommie/Ghommie-cit501 
Porting some runtime fixes.
 2020-01-07 01:00:25 +00:00
Lin
718d4a080d Merge pull request #9878 from Ghommie/Ghommie-cit382 
Unmodularize several machinery and structures
 2020-01-07 00:31:24 +00:00
Ghommie
dcb2ae77fa Porting some runtime fixes. 2020-01-06 02:14:25 +01:00