shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,449 Commits 5 Branches 0 Tags
4768b23398ec63a8f218d38de9a477c03bc0d521
Commit Graph

1058 Commits

Author SHA1 Message Date
silicons
4768b23398 Merge pull request #14860 from Arturlang/nanite_updates 
Updates our nanite stuff to TG's, mostly
 2021-06-18 20:01:05 -07:00
Lin
1e66357706 Merge pull request #14851 from Vynzill/spritinghell 
Extended Armwraps
 2021-06-16 11:30:01 -07:00
Timothy Teakettle
e12380cc40 Update embedded.dm (#14854) 2021-06-16 19:27:19 +02:00
Artur
724b34f55d https://github.com/tgstation/tgstation/pull/54710 2021-06-16 00:44:32 +03:00
Vynzill
df72710cae herewego 2021-06-14 17:19:05 -05:00
silicons
8feb473e65 fixes 2021-06-12 04:49:23 -07:00
silicons
55e8d67521 refactor a bit 2021-06-12 04:41:58 -07:00
silicons
85b1125c83 fix 2021-06-12 04:36:02 -07:00
silicons
4afb5209a1 Merge pull request #14637 from TheObserver-sys/DerringerPass1 
Derringer Pass 1: No Rest for the Wicked(ly Bad Coder {me})
 2021-05-07 18:42:24 -06:00
silicons
cb1e2f3730 thing 2021-05-06 02:09:06 -07:00
silicons
d07f1f3d30 Update radioactive.dm (#14615) 2021-04-24 21:51:53 +02:00
The0bserver
59d69125f6 Consistency: You can hide it in your boots! 2021-04-21 12:18:01 -04:00
silicons
e8e625cb5c Merge pull request #14603 from Putnam3145/fix-base-option 
Activity tracking; traitor class tweaks
 2021-04-18 18:49:27 -06:00
Putnam
4811216f07 Activity tracking; traitor class tweaks 2021-04-13 06:42:32 -07:00
silicons
ef2482c6b0 renders storage objects independently per user (#14545) 
* sigh

* sigh

* override

* hah..

* kinda working

* done
 2021-04-13 15:16:21 +02:00
LetterN
f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
silicons
bf382f490c Merge pull request #14518 from necromanceranne/shield_explodies_fix 
Shields: Changes, additional flags, bug fixes, sprites
 2021-03-27 01:31:55 -06:00
necromanceranne
2368968c66 Ports #42721 which happened to resolve this already 2021-03-26 08:45:14 +11:00
LetterN
e3fb2d5491 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-24 21:55:47 +08:00
LetterN
292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
kappa-sama
1f7b15d8f8 clonwops 2021-03-19 15:35:17 -03:00
kiwedespars
69d927e756 Merge branch 'master' into void-but-for-real 2021-03-12 23:10:19 -08:00
Letter N
935e46b492 The Mapping Update 
Cleans up the map (again)
Makes mining code more better
 2021-03-12 12:11:35 +08:00
kiwedespars
3b92e33112 Merge branch 'master' into void-but-for-real 2021-03-09 12:29:50 -08:00
kiwedespars
3ce6459aef void heretic and many other prs 2021-03-09 02:58:34 -08:00
Sneakyrat6
d5b0251cb5 Merge branch 'master' into matContainer 2021-03-09 05:42:47 -05:00
Sneakyrat6
0db08088c4 Fixes material insertion animations not working when there is no silo 2021-03-07 22:43:55 -05:00
Sneakyrat6
395bdaf5f9 removes code i commented out 2021-03-07 04:13:18 -05:00
Sneakyrat6
703567e591 other fixes 2021-03-07 04:09:36 -05:00
Sneakyrat6
f875218284 Fixes material component 2021-03-06 03:48:52 -05:00
Letter N
edfe7220c4 lintfix 2021-03-05 15:45:57 +08:00
Letter N
cb346a3847 a 2021-03-05 14:29:36 +08:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
Letter N
037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
SandPoot
69af7d35f8 Update remote_materials.dm 2021-02-18 15:16:40 -03:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot
2e29f30fdf Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing 2021-02-18 15:04:22 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Lin
3b9f1cb4ec Merge pull request #14239 from Hatterhat/golem-gps-pass2 
well that's what i get for trusting my own code - makes golem GPSes start off, but actually this time
 2021-02-17 17:29:03 -06:00
silicons
e009b9ef5f Merge pull request #14186 from SmArtKar/trading_card_game 
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
 2021-02-17 01:30:13 -07:00
Hatterhat
c5a9a8905a actually makes golem gpses start off 2021-02-13 15:20:24 -06:00
Letter N
45d6a5f87f it compiles, UNTESTED YET 2021-02-13 21:41:59 +08:00
Letter N
a2419f760a Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-12 13:18:09 +08:00
Letter N
f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
silicons
993a849700 Merge pull request #14155 from SmArtKar/tgui_observe 
Port of TG's "Auto Observe"
 2021-02-04 12:49:09 -07:00
SmArtKar
7b2e1ef44f TCG! 2021-02-02 14:40:29 +03:00
Lin
0dd82df64b Merge pull request #14113 from silicons/piggybacking 
fixes piggybacking initial offsets. Also, adds the ability to carry around pAIs, because this totally won't result in more metaclique drama.
 2021-01-31 23:33:59 -06:00
SmArtKar
a7bc066891 Auto-Observe! 2021-01-28 17:09:28 +03:00
silicons
6a2ae34ebe Merge pull request #14111 from Arturlang/revenant_TK 
[READY]Gives the revenant TK
 2021-01-25 23:17:09 -07:00