shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,382 Commits 5 Branches 0 Tags
62e5037eab892b1aaf55b4fad84ca1b837a9b6c4
Commit Graph
20382 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
TrilbyspacecloneandGitHub 62e5037eab Merge branch 'master' into patch-118 2019-05-12 02:03:32 -04:00
TrilbyspacecloneandGitHub db74544a7c Create autolathe_designs.dm 2019-05-12 02:02:49 -04:00
kevinz000andGitHub 8200e09fa2 Merge pull request #8340 from Poojawa/patch-1 
Updates travis to 512.1467
 2019-05-11 22:22:01 -07:00
CitadelStationBot d8ad29ac26 Automatic changelog generation for PR #8316 [ci skip] 2019-05-12 00:21:18 -05:00
kevinz000andGitHub 9f3aa6de13 Merge pull request #8316 from Trilbyspaceclone/Lock_and_key 
Better Locked Collar checks
 2019-05-11 22:21:16 -07:00
CitadelStationBot 3ba9df9604 Automatic changelog generation for PR #8342 [ci skip] 2019-05-12 00:19:47 -05:00
kevinz000andGitHub 4f12a762f3 Merge pull request #8342 from BurgerLUA/Cult-Improvements-and-Fixes 
Adds EMP Defensive Traps to Clockcult
 2019-05-11 22:19:46 -07:00
CitadelStationBot a06c83c8af Automatic changelog generation for PR #8322 [ci skip] 2019-05-12 00:18:32 -05:00
kevinz000andGitHub 90c3e4b776 Merge pull request #8322 from Trilbyspaceclone/patch-117 
Buffs mag-gun recharges speed
 2019-05-11 22:18:29 -07:00
kevinz000andGitHub db99b595f3 Merge pull request #8331 from Useroth/dick-circuits 
Dildo-shaped circuit assemblies. Because that's what the community needs.
 2019-05-11 22:17:46 -07:00
kevinz000andGitHub 36ee078e23 Merge pull request #8333 from Useroth/ayy-baton 
Abductor baton buff. Because it currently sucks balls.
 2019-05-11 22:17:27 -07:00
CitadelStationBot aae23945a6 Automatic changelog generation for PR #8334 [ci skip] 2019-05-12 00:17:10 -05:00
kevinz000andGitHub cd87e81a6a Merge pull request #8334 from dtfe3/music-maxlines-increase 
Increased music maxlines from 300 to 600
 2019-05-11 22:17:08 -07:00
kevinz000andGitHub 86e3992945 Merge pull request #8335 from Poojawa/quick-fiiiix-marking 
Quick fiiiix marking
 2019-05-11 22:16:37 -07:00
kevinz000andGitHub 9b135ed56b Merge pull request #8338 from Sishen1542/satchel-holding 
Satchel of Holding!
 2019-05-11 22:14:15 -07:00
CitadelStationBot a818e92f82 Automatic changelog generation for PR #8341 [ci skip] 2019-05-12 00:13:20 -05:00
kevinz000andGitHub 4276f53338 Merge pull request #8341 from Trilbyspaceclone/golden 
Golden toolboxes.
 2019-05-11 22:13:18 -07:00
BurgerLua 8463163faa NEWLINE 2019-05-10 19:22:09 -07:00
BurgerLua f66326ab51 Fixes an potential AI exploit. 2019-05-10 19:19:42 -07:00
BurgerLua 4aba11739b Finishing touches. 2019-05-10 19:15:42 -07:00
BurgerLua d97bf47b95 Added 2019-05-10 18:12:36 -07:00
TrilbyspacecloneandGitHub 427c981386 Update tgstation.dme 2019-05-10 16:49:43 -04:00
TrilbyspacecloneandGitHub af7b7fc638 Update autolathe_designs_medical_and_dinnerware.dm 2019-05-10 16:48:52 -04:00
TrilbyspacecloneandGitHub 38696f4997 Delete autolathe_designs.dm 2019-05-10 16:47:59 -04:00
TrilbyspacecloneandGitHub 50ac2025ab Update tgstation.dme 2019-05-10 16:47:11 -04:00
TrilbyspacecloneandGitHub 2885330459 commit die 2019-05-10 16:30:39 -04:00
TrilbyspacecloneandGitHub a703b8b85f Yep this works 100% no errors at all! 2019-05-10 16:30:01 -04:00
TrilbyspacecloneandGitHub 86e5d96679 Update uplink_items.dm 2019-05-10 14:55:46 -04:00
TrilbyspacecloneandGitHub 4c0caa3aae Update toolbox.dm 2019-05-10 14:51:49 -04:00
TrilbyspacecloneandGitHub 651a452ed0 Update recipes.dm 2019-05-10 14:50:44 -04:00
PoojawaandGitHub ba0474feb0 Updates travis to 512.1467 
Lots of good updates. we should see if they make stuff better
 2019-05-10 08:56:05 -05:00
Poojawa dd8e48b383 fixes syndicate helmet, adjusts human sprites 2019-05-10 07:44:53 -05:00
Sishen 1b28f0e968 cloak revert 2019-05-09 20:49:38 -04:00
Sishen c3df1b354e Satchel of holding 
fashion creep
 2019-05-09 20:44:07 -04:00
Poojawa 28eb23d474 Fixes prosthetics and missing markings 2019-05-09 16:15:03 -05:00
Sishen c9da8e375a Cloak Fix 2019-05-09 16:35:34 -04:00
Poojawa 9be9ce6d4f Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into quick-fiiiix-marking 2019-05-09 14:46:33 -05:00
dtfe3andGitHub 0e0dff14b9 Increased music maxlines from 300 to 600 
Allows players to play longer and more advanced songs on the instruments.
 2019-05-09 14:10:43 +02:00
UserothandGitHub 83661fff9d Update abduction_gear.dm 2019-05-09 13:17:12 +02:00
Useroth 07685a1074 Abductor baton buff. Because it currently sucks balls. 2019-05-09 12:20:02 +02:00
Useroth b80bb21219 Dildo-shaped circuit assemblies. Because that's what the community needs. 2019-05-09 08:45:47 +02:00
CitadelStationBot 49a012ea87 Automatic changelog generation for PR #8323 [ci skip] 2019-05-08 03:34:36 -05:00
kevinz000andGitHub a7192734dd Merge pull request #8323 from Trilbyspaceclone/inducer 
Makes a new COMBAT inducer! - Admin only
 2019-05-08 01:34:33 -07:00
Sishen 5bcc1680fe Hazard Vest sprite fix 
Removes one column of pixels from the side sprite of hazard vest to not stick out of cloaks.

https://puu.sh/DpkL5/f35d681c05.png
https://puu.sh/DpkVY/021d39eea4.png
 2019-05-07 22:56:43 -04:00
deathride58andGitHub 2b1261ab03 Merge pull request #8284 from Citadel-Station-13/kevinz000-patch-44 
adds sdql2 new()/instantiation call so it's easier to fill things with cream pies
 2019-05-07 02:19:40 -04:00
deathride58andGitHub a3317ffe89 Merge pull request #8280 from Citadel-Station-13/kevinz000-patch-43 
ASIMOV: human being --> "person of a NT approved crew species"
 2019-05-07 02:19:28 -04:00
TrilbyspacecloneandGitHub 9adeccc5e1 Update autolathe_designs.dm 2019-05-06 23:47:39 -04:00
TrilbyspacecloneandGitHub ae75bf2fd1 Update autolathe_designs.dm 2019-05-06 23:46:31 -04:00
CitadelStationBot e22908a0ae Automatic changelog generation for PR #8278 [ci skip] 2019-05-06 21:13:52 -05:00
deathride58andGitHub f318ad7d1b Merge pull request #8278 from Trilbyspaceclone/patch-106 
Buffs blob Shield armor, as well as weaken state
 2019-05-06 22:13:50 -04:00