shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,438 Commits 5 Branches 0 Tags
50b6a610e942864b1b4ccfac73fdecd5fdc9048f
Commit Graph
20438 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
kevinz000andGitHub 50b6a610e9 Merge pull request #8303 from BurgerLUA/Vent-Clog-Fixes-And-Additions 
Vent Clog Event Rebalance and Improvements
 2019-05-17 21:27:32 -07:00
CitadelStationBot d4eba1f12a Automatic changelog generation for PR #8348 [ci skip] 2019-05-17 10:36:22 -05:00
kevinz000andGitHub 844fb13467 Merge pull request #8348 from Trilbyspaceclone/patch-123 
Makes suitcases craftable
 2019-05-17 08:36:20 -07:00
kevinz000andGitHub fac9f2a3d3 Merge pull request #8364 from Poojawa/Vent-and-scrubbers 
Improved Vent and Scrubber icon port
 2019-05-17 08:35:50 -07:00
kevinz000andGitHub 77232cc4bb Merge pull request #8365 from Poojawa/salt-inducer 
[s] Increases salt 100 fold
 2019-05-17 08:34:36 -07:00
deathride58andGitHub 276a6e9896 Merge pull request #8307 from Citadel-Station-13/kevinz000-patch-49 
buff sleepy pens to quickly drain stamina after 10 seconds
 2019-05-17 00:54:17 -04:00
deathride58andGitHub 02eb7f9e61 Merge pull request #8268 from Citadel-Station-13/kevinz000-patch-38 
Makes auto transfer delay loaded from config rather than hardcoded to 2 hours
 2019-05-17 00:34:17 -04:00
CitadelStationBot c8eb4ba8cb Automatic changelog generation for PR #8311 [ci skip] 2019-05-16 23:33:14 -05:00
deathride58andGitHub aa1fdd9fb7 Merge pull request #8311 from Trilbyspaceclone/patch-114 
Adds new phobias and tweaks others - syndicate, eye phobia
 2019-05-17 00:33:12 -04:00
deathride58andGitHub ba125a2648 Merge pull request #8270 from Citadel-Station-13/kevinz000-patch-40 
makes Eutactic (so the other energy sword) swords not strictly crappier than normal swords, makes combining them possible and makes the hyper-eutactic blade not strictly crappier than the desword
 2019-05-17 00:14:36 -04:00
deathride58andGitHub cbac4b1daf Merge pull request #8330 from Scorpion-117/master 
This is an entire addition to put stargazers back into clock cult.
 2019-05-17 00:13:35 -04:00
deathride58andGitHub d855a7eb0d Merge pull request #8332 from Useroth/collars-n-shit 
Two new collar types (with lockable variants). All collars are now colorable a'la polychromic stuff.
 2019-05-17 00:10:41 -04:00
deathride58andGitHub e7d50f6e57 Merge pull request #8355 from CalamaBanana/Circuit-Colors 
Adds pink and a custom color option to the circuit coloring tool
 2019-05-16 23:30:00 -04:00
Poojawa 0b46794ce9 Increases salt 100 fold 2019-05-16 09:43:03 -05:00
Poojawa 5f1e600155 vent and scrubbers icon port 
Ports improved vents and scrubbers by Patheo on TG !
 2019-05-16 09:24:44 -05:00
CalamaBananaGitHubUseroth
 		1e7b537166 Update code/modules/integrated_electronics/core/detailer.dm 
Prettier list

Co-Authored-By: Useroth <37159550+Useroth@users.noreply.github.com>
 2019-05-16 00:42:05 +02:00
CalamaBanana 9e00562e68 Added custom option 
Added custom option to the color selection
 2019-05-15 13:13:17 +02:00
Useroth 701b01dfa6 Just another commit to make travis fucking recompile it 2019-05-15 02:30:47 +02:00
Useroth 8500e69088 Merge branch 'collars-n-shit' of github.com:Useroth/Citadel-Station-13 into collars-n-shit 2019-05-15 02:09:41 +02:00
UserothGitHubdeathride58
 		3f64128513 Apply suggestions from code review 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-05-15 02:08:43 +02:00
Useroth 6a29a0744b Applied suggested changes. 2019-05-15 02:07:16 +02:00
UserothGitHubdeathride58
 		f910eea9f8 Update code/modules/clothing/neck/_neck.dm 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-05-15 01:41:18 +02:00
CalamaBanana 7cd74e6601 Adds pink to the circuit coloring tool 2019-05-15 00:07:53 +02:00
CitadelStationBot fcc8212b72 Automatic changelog generation for PR #8336 [ci skip] 2019-05-14 15:48:56 -05:00
kevinz000andGitHub a3114d830a Merge pull request #8336 from BurgerLUA/Integrated-Circuit-Fixes-and-Additions 
Adds Stun Circuit, Pneumatic Cannon Circuit. Makes Extinguisher and Smoke Reagent circuits work.
 2019-05-14 13:48:54 -07:00
CitadelStationBot f16b5eca88 Automatic changelog generation for PR #8352 [ci skip] 2019-05-13 21:30:28 -05:00
kevinz000andGitHub a4b6037e9c Merge pull request #8352 from deathride58/isweartofuckinggodtgedition 
[S] Fixes a fairly huge vector for server crashes (tgcode edition)
 2019-05-13 19:30:24 -07:00
deathride58 06ea7de46b [S] Fixes a fairly huge vector for server crashes 2019-05-13 21:49:33 -04:00
TrilbyspacecloneandGitHub 41400ff94a Update recipes.dm 2019-05-12 21:54:18 -04:00
TrilbyspacecloneandGitHub c9f6b02a0e Update briefcase.dm 2019-05-12 21:23:40 -04:00
TrilbyspacecloneandGitHub 90268dea1d Update recipes.dm 2019-05-12 21:17:28 -04:00
BurgerLua 34cb661211 Requested changes 2019-05-12 13:44:23 -07: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