shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,358 Commits 5 Branches 0 Tags
c2f4a46ecfdd4121a77cd2fcdc7262a0b032cd72
Commit Graph

5325 Commits

Author SHA1 Message Date
lolman360
f696a461af Update RSF.dm 2020-07-18 16:10:25 +10:00
lolman360
0e38e1ff39 e 2020-07-18 16:03:32 +10:00
BlackMajor
f68962e9d3 This is a bad idea 2020-07-18 16:46:08 +12:00
timothyteakettle
e8fade4f7f changes 2020-07-18 02:29:12 +01:00
CameronWoof
431c52b7e2 Merge remote-tracking branch 'upstream/master' into advanced-sutures-and-mesh 2020-07-17 17:22:43 -07:00
silicons
044525519a Merge pull request #12750 from timothyteakettle/loadout-plushies 
replaces plushies in the loadout menu with a choice box
 2020-07-17 17:10:14 -07:00
silicons
655afda020 Merge pull request #12780 from BlackMajor/borgo 
Even more engiborg power creep
 2020-07-17 17:08:23 -07:00
silicons
3d5c77f62b Merge pull request #12779 from b1tt3r1n0/circlegame 
Circle Game, Updated
 2020-07-17 17:08:06 -07:00
silicons
04df84d1e0 Merge pull request #12776 from timothyteakettle/snail-shells 
snail shell backpack
 2020-07-17 17:07:46 -07:00
Winter Flare
61f4fbc67a Merge branch 'master' into foodport-p2-7/12/20 2020-07-17 19:27:50 -04:00
Timothy Teakettle
93b4570f8d more changes 2020-07-17 23:23:47 +01:00
Timothy Teakettle
0bc16c7a37 Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port 2020-07-17 22:39:03 +01:00
Timothy Teakettle
a4478b0cda it continues 2020-07-17 22:38:28 +01:00
SiliconMain
82e0a3b66b Update geiger_counter.dm 2020-07-17 14:32:46 -05:00
Artur
73a758adc8 Decal Painter fix 2020-07-17 22:05:46 +03:00
silicons
813fd9b3e0 Update shields.dm 2020-07-17 09:00:02 -07:00
BlackMajor
9b671b7dd1 I'm gonna regret this. Adds stock parts (meaning cells) to the gripper list 2020-07-18 03:08:52 +12:00
BlackMajor
eb9b3da581 Blacklist logic fix 2020-07-17 16:13:18 +12:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
timothyteakettle
584e74590f port1 2020-07-17 02:01:33 +01:00
silicons
e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0 
[READY]TGUI 3.0
 2020-07-16 17:28:42 -07:00
BlackMajor
fc909cd7c6 Added material sheets and tiles. This took more work than you'd think. 2020-07-17 01:17:54 +12:00
Artur
af65b626e3 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-16 15:56:08 +03:00
Letter N
2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08:00
CameronWoof
a493ecdc4a suture and mesh additions 2020-07-15 16:44:24 -07:00
Timothy Teakettle
0184739005 undo the woopsy 2020-07-15 19:53:37 +01:00
silicons
6121cbd091 Merge pull request #12738 from timothyteakettle/travelling-traders 
the travelling trader midround event
 2020-07-15 08:50:20 -07:00
BlackMajor
06a4e57de9 changing this just means they can pick up jetpacks 2020-07-16 02:11:38 +12:00
BlackMajor
bd7c9d11d3 oh no 2020-07-16 02:02:29 +12:00
Keate Senior
6275b5ae97 Forgot the 'advanced' prefix here, since thats what it is, essentially 2020-07-15 00:07:57 -04:00
b1tt3r1n0
d678806143 Circle Game, Updated 
Title
 2020-07-14 23:40:09 -04:00
Winter Flare
d6413d5559 Adds Cracker Box, Soup 
Fixes stray pixels on some sushi sprites.
Adds Spiral Soup, Bear Chili
Adds Cracker Box
 2020-07-14 22:43:34 -04:00
Timothy Teakettle
0a4a0fadb3 snails 2020-07-14 20:59:25 +01:00
Arturlang
75eb276c98 Merge branch 'master' into TGUI-3.0 2020-07-14 16:17:23 +03:00
Timothy Teakettle
8de062adbb fix 2020-07-13 19:46:51 +01:00
Lin
2be790e8d7 Merge pull request #12736 from Citadel-Station-13/silicons-patch-21 
hey let's not have 25% micro borgs going around killing people
 2020-07-13 11:51:10 -05:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Strazyplus
15470de825 Don't DragON me, mister! 
Removes comments from code
Removes mentions of Navier
Why are we still here? Just to suffer?
 2020-07-13 07:01:48 -04:00
Timothy Teakettle
75c962ef7b handle removal 2020-07-12 20:18:49 +01:00
Timothy Teakettle
c3d490a803 very cool 2020-07-12 20:15:57 +01:00
Strazyplus
92a6d673ba Drakes are dragons too 2020-07-12 07:32:09 -04:00
Strazyplus
2eb353d195 More License detail tweaks. 2020-07-12 00:56:43 -04:00
Keate Senior
80b4c03c82 Initial changes to get this to github for public reviewing 
-Removes the Reebe z level and puts it on the cc z level
-Replaces the Neovgre mech stepsound
-Moves spacial gateway into drivers so the cult isn't stuck stationside
-Adds the Belligerant scripture, which applies the Belligerant status effect to non-clankers in range
-Various other changes currently commented out for later work on them.
-removes the abductor teleport cameras from Reebe
-adds a Brass multitool, essentially just an advanced multitool with a special sprite.
-makes clockcult armor have 0 laser defense normally and 10 defense when the ark is almost done summoning Ratvar instead of -25 --> -15
-Makes spear recalling worded to support the addition of new weapons to summon
-Adds new structures for power generation and shuttle delaying
-Other changes I've probably forgotton, but are too lazy to scrounge through the code at 12:43 AM
 2020-07-12 00:43:54 -04:00
Strazyplus
582be67063 Lawyer-drake when? 
unmodularized drakeborg
added licencing documentation
reduced / simpified code comments
 2020-07-12 00:42:46 -04:00
silicons
f99a0564de Merge pull request #12693 from Owai-Seek/trashbag-7-4-20 
Trashbag Whitelist Update
 2020-07-11 21:28:12 -07:00
timothyteakettle
3e5f981825 speed 4 for embeds 2020-07-12 03:17:50 +01:00
Strazyplus
13fe156a8b Dragon online! 2020-07-11 21:32:34 -04:00
timothyteakettle
fbb9fe2d9c better fork 2020-07-12 02:14:50 +01:00
timothyteakettle
cff2e3d680 never set max amount to 0 2020-07-12 00:58:34 +01:00
timothyteakettle
8712dd6de4 bugfixes 2020-07-12 00:31:45 +01:00