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

12698 Commits

Author SHA1 Message Date
CalamaBanana
de841761b2 Charter apostrophes fixed, too 2019-05-18 16:19:25 +02:00
kevinz000
8b127387c6 Merge pull request #8344 from Trilbyspaceclone/patch-119 
Makes sushie fucken have its correct subcat so we can craft it
 2019-05-17 21:28:59 -07:00
kevinz000
20b27ea92c Merge pull request #8362 from dtfe3/jetpack-stuff 
Making the Improvised Jetpack recipe less confusing
 2019-05-17 21:27:55 -07:00
kevinz000
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
kevinz000
844fb13467 Merge pull request #8348 from Trilbyspaceclone/patch-123 
Makes suitcases craftable
 2019-05-17 08:36:20 -07:00
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
dtfe3
3ece75eb76 Makes the jetpack easier to craft 2019-05-16 15:30:46 +02:00
dtfe3
d228334cd5 Fix for the improvised jetpack 2019-05-16 15:19:59 +02:00
CalamaBanana
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
Useroth
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
Useroth
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
kevinz000
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
deathride58
06ea7de46b [S] Fixes a fairly huge vector for server crashes 2019-05-13 21:49:33 -04:00
Trilbyspaceclone
41400ff94a Update recipes.dm 2019-05-12 21:54:18 -04:00
Trilbyspaceclone
c9f6b02a0e Update briefcase.dm 2019-05-12 21:23:40 -04:00
Trilbyspaceclone
90268dea1d Update recipes.dm 2019-05-12 21:17:28 -04:00
BurgerLua
34cb661211 Requested changes 2019-05-12 13:44:23 -07:00
kevinz000
9f3aa6de13 Merge pull request #8316 from Trilbyspaceclone/Lock_and_key 
Better Locked Collar checks
 2019-05-11 22:21:16 -07:00
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
86e3992945 Merge pull request #8335 from Poojawa/quick-fiiiix-marking 
Quick fiiiix marking
 2019-05-11 22:16:37 -07:00
kevinz000
9b135ed56b Merge pull request #8338 from Sishen1542/satchel-holding 
Satchel of Holding!
 2019-05-11 22:14:15 -07:00
kevinz000
4276f53338 Merge pull request #8341 from Trilbyspaceclone/golden 
Golden toolboxes.
 2019-05-11 22:13:18 -07:00
Trilbyspaceclone
2833dab538 le sigh 2019-05-11 14:49:51 -04:00
Trilbyspaceclone
460459a1dd Update craft.dm 2019-05-11 14:08:43 -04: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
Trilbyspaceclone
86e5d96679 Update uplink_items.dm 2019-05-10 14:55:46 -04:00
Trilbyspaceclone
4c0caa3aae Update toolbox.dm 2019-05-10 14:51:49 -04:00
Trilbyspaceclone
651a452ed0 Update recipes.dm 2019-05-10 14:50:44 -04:00
Scorpion-117
7a8adff8e0 testing a value of 7 
x
 2019-05-10 01:58:53 -06:00
Scorpion-117
9fd61b660d modifying to make it take far more power to produce 
x
 2019-05-10 01:55:25 -06:00
BurgerLua
8b935b9abf Reverts cooking change, adds safety checks. 2019-05-09 21:10:44 -07:00
Sishen
c3df1b354e Satchel of holding 
fashion creep
 2019-05-09 20:44:07 -04:00
BurgerLua
6df27ef2a3 Updated integrated circuits 2019-05-09 15:25:48 -07:00
Poojawa
28eb23d474 Fixes prosthetics and missing markings 2019-05-09 16:15:03 -05:00
dtfe3
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
Useroth
83661fff9d Update abduction_gear.dm 2019-05-09 13:17:12 +02:00