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

20381 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CalamaBanana
b3668a32d0 Fixes color of elf ears 
Fixes color of elf ears
 2019-05-17 20:29:43 +02:00
CitadelStationBot
fcc8212b72 Automatic changelog generation for PR #8336 [ci skip] 2019-05-14 15:48:56 -05: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
CitadelStationBot
f16b5eca88 Automatic changelog generation for PR #8352 [ci skip] 2019-05-13 21:30:28 -05:00
kevinz000
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
BurgerLua
34cb661211 Requested changes 2019-05-12 13:44:23 -07:00
kevinz000
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
kevinz000
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
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
CitadelStationBot
a06c83c8af Automatic changelog generation for PR #8322 [ci skip] 2019-05-12 00:18:32 -05:00
kevinz000
90c3e4b776 Merge pull request #8322 from Trilbyspaceclone/patch-117 
Buffs mag-gun recharges speed
 2019-05-11 22:18:29 -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
CitadelStationBot
aae23945a6 Automatic changelog generation for PR #8334 [ci skip] 2019-05-12 00:17:10 -05: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
CitadelStationBot
a818e92f82 Automatic changelog generation for PR #8341 [ci skip] 2019-05-12 00:13:20 -05:00
kevinz000
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
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
Poojawa
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
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
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
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
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
kevinz000
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
deathride58
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
deathride58
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
Trilbyspaceclone
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
deathride58
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
deathride58
5e2a9669d1 Merge pull request #8285 from Citadel-Station-13/kevinz000-patch-45 
vent_clog event now respects vent welding
 2019-05-06 22:08:43 -04:00