shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,707 Commits 5 Branches 0 Tags
e89e7da2fd5c619e47c3ca02bc93b0a0ddc69b6d
Commit Graph
39707 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
siliconsandGitHub e89e7da2fd Update xmas.dm 2020-12-13 18:55:07 -07:00
CitadelStationBot 4b52e3c6a3 Automatic changelog generation for PR #13762 [ci skip] 2020-12-12 20:05:48 -06:00
BlackMajorandGitHub 0d25f9bd83 Merge pull request #13762 from Citadel-Station-13/silicons-patch-20 
removes noteleport from luxury shuttle
 2020-12-13 15:05:45 +13:00
siliconsandGitHub 0d63fc9cf4 Update shuttles.dm 2020-12-12 19:02:56 -07:00
CitadelStationBot 3e613c90e4 Automatic changelog generation for PR #13713 [ci skip] 2020-12-12 19:53:16 -06:00
siliconsandGitHub 66403e3a9e Merge pull request #13713 from timothyteakettle/alt-click-gas-mask 
all gas masks (but welding + glass) can be alt clicked to show/hide identity
 2020-12-12 18:53:13 -07:00
LinandGitHub 0d95172bef Merge pull request #13749 from Citadel-Station-13/silicons-patch-7 
fixes nonsensical verb
 2020-12-12 20:00:41 +00:00
CitadelStationBot 0f6ee3ea86 Automatic changelog generation for PR #13743 [ci skip] 2020-12-12 02:55:56 -06:00
siliconsandGitHub c2727ca278 Merge pull request #13743 from Linzolle/thunderdome 
thunderdome entertainment monitors fix + stuff
 2020-12-12 01:55:53 -07:00
CitadelStationBot 0407d48f3d Automatic changelog generation for PR #13750 [ci skip] 2020-12-12 02:55:38 -06:00
siliconsandGitHub 79cd6819f0 Merge pull request #13750 from EmeraldSundisk/deltacargo-129 
Fixes Delta's cargo conveyor problem.
 2020-12-12 01:55:35 -07:00
CitadelStationBot 5225999bea Automatic changelog generation for PR #13737 [ci skip] 2020-12-12 02:52:19 -06:00
siliconsandGitHub fab40166d3 Merge pull request #13737 from qwertyquerty/flash 
Flash the screen on climax
 2020-12-12 01:52:17 -07:00
CitadelStationBot 47febac72a Automatic changelog generation for PR #13617 [ci skip] 2020-12-11 20:11:59 -06:00
Putnam3145andGitHub f0e51d666c Merge pull request #13617 from timothyteakettle/loadout-json 
loadout 2: electric boogaloo
 2020-12-11 18:11:56 -08:00
CitadelStationBot 401d11fbc7 Automatic changelog generation for PR #13747 [ci skip] 2020-12-11 15:38:22 -06:00
DeltaFireandGitHub e1bf6b94f9 Merge pull request #13747 from MrJWhit/thicc-fuel-tanks 
Porting to the /tg/ sprite changes, and functionality, of large reagent containers
 2020-12-11 22:38:18 +01:00
CitadelStationBot 512e4cb696 Automatic changelog generation for PR #13739 [ci skip] 2020-12-11 10:59:09 -06:00
LinandGitHub c1fee8e5c4 Merge pull request #13739 from timothyteakettle/tongue-and-eyes 
custom eyes and tongues now properly carry across cloning
 2020-12-11 16:59:05 +00:00
CitadelStationBot 1ec90799d6 Automatic changelog generation for PR #13734 [ci skip] 2020-12-11 10:58:10 -06:00
LinandGitHub 4077537d45 Merge pull request #13734 from keronshb/Blobreflect-fix 
Reflective Blob fix
 2020-12-11 16:58:07 +00:00
MrJWhit d10c9db8b2 Update reagent_dispenser.dm 2020-12-11 10:31:42 -05:00
CitadelStationBot 6cc917bc07 Automatic changelog generation for PR #13745 [ci skip] 2020-12-10 17:42:34 -06:00
DeltaFireandGitHub bece5971b8 Merge pull request #13745 from Arturlang/soulstone_references 
Adds more sanity to construct soul returning
 2020-12-11 00:42:30 +01:00
EmeraldSundiskandGitHub 2a35a23509 Add files via upload 2020-12-10 13:35:47 -08:00
siliconsandGitHub 8af8063e73 Update input.dm 2020-12-10 13:39:22 -07:00
keronshb 07b56e1542 Adds new line 
new line added
 2020-12-10 15:29:13 -05:00
MrJWhit 477330197c Huh we already had this 2020-12-10 01:14:43 -05:00
CitadelStationBot 71343bf130 Automatic changelog generation for PR #13738 [ci skip] 2020-12-09 22:47:49 -06:00
siliconsandGitHub a4e6df8f9a Merge pull request #13738 from DeltaFire15/heretic-tweaks 
Updates the heretics gamemode with a bunch of changes from /tg/
 2020-12-09 21:47:46 -07:00
CitadelStationBot aa6bcd3859 Automatic changelog generation for PR #13704 [ci skip] 2020-12-09 22:47:09 -06:00
siliconsandGitHub 821c3becc3 Merge pull request #13704 from Putnam3145/make-emotes-local 
Makes emotes show up in the "local" filter with TGUI
 2020-12-09 21:47:06 -07:00
siliconsandGitHub a508e0e4da Merge pull request #13732 from Citadel-Station-13/tgs-dmapi-update 
Automatic TGS DMAPI Update
 2020-12-09 21:45:46 -07:00
tgstation-server 5b74596d72 Update TGS DMAPI 2020-12-10 00:47:22 +00:00
EmeraldSundisk c15f946104 Update DeltaStation2.dmm 2020-12-09 10:35:45 -08:00
EmeraldSundiskandGitHub 9f4a7a47b9 Merge pull request #68 from Citadel-Station-13/master 
12/9
 2020-12-09 10:06:17 -08:00
CitadelStationBot 2a199bdbec Automatic changelog generation for PR #13740 [ci skip] 2020-12-09 10:58:10 -06:00
DeltaFireandGitHub 16e7d8baf0 Merge pull request #13740 from Linzolle/nitpick 
the biggest nitpick in the entire universe
 2020-12-09 17:58:06 +01:00
Artur ef13b07dd4 Forgot this 2020-12-09 17:56:28 +02:00
Artur 827920dba7 Paranoid ramblings 2020-12-09 17:54:44 +02:00
Linzolle 0ddc053a8b what if mapmerge worked 2020-12-08 17:35:21 -06:00
Linzolle 3e951d334c fix entertainment monitors 2020-12-08 17:21:14 -06:00
Timothy Teakettle 132a3c9526 color non polychromic items 2020-12-08 19:29:34 +00:00
CitadelStationBot a2834b8ebc Automatic changelog generation for PR #13741 [ci skip] 2020-12-08 11:51:37 -06:00
siliconsandGitHub b9c326388c Merge pull request #13741 from DeltaFire15/critical-objective-fix 
[s] Objective fixes : screaming lizard edition
 2020-12-08 10:51:33 -07:00
DeltaFire 69a1d6e603 oop 2020-12-08 16:32:34 +01:00
DeltaFire 86661a4fe0 aaaaaaaaaaaaaa 2020-12-08 16:30:09 +01:00
Linzolle ad200fbb71 a stupid nitpick 2020-12-07 17:52:07 -06:00
CitadelStationBot be5bccd847 Automatic changelog generation for PR #13736 [ci skip] 2020-12-07 17:18:38 -06:00
LinandGitHub e38543ae48 Merge pull request #13736 from DeltaFire15/abductor-surgery-robotstuff 
Makes the experimental organ replacement surgery work on robots
 2020-12-07 23:18:35 +00:00