shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,959 Commits 5 Branches 0 Tags
4e88980cf5485d27c73ae88533e02b8bbbb3db87
Commit Graph

18959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58
4e88980cf5 readds the kitchen gun sprite (fixes the kitchen gun being invisible) 2018-11-21 01:56:20 -05:00
nik707
59dc18d904 Merge pull request #7637 from Trilbyspaceclone/Slimey_points 
[READY] More Slime core deconstruction, now with Cross bread slime cores! (Best Grammar! 100% ready for merging PDM!!)
 2018-11-20 19:49:25 -06:00
nik707
bea7b2a09f Merge pull request #7698 from Trilbyspaceclone/Cargo_memes_1 
[Ready] More riot gear, cap pen and more!
 2018-11-20 19:14:59 -06:00
Trilbyspaceclone
810f7f186d Headset sorrow 2018-11-20 19:37:13 -05:00
nik707
82f03774c5 Merge pull request #7684 from Trilbyspaceclone/master 
[Ready]Silly Tips
 2018-11-20 18:31:16 -06:00
Trilbyspaceclone
66b5f06514 Grammar 2018-11-20 16:39:01 -05:00
Trilbyspaceclone
c411c6671a truns 2018-11-20 16:35:33 -05:00
CitadelStationBot
36f3317306 Automatic changelog generation for PR #7742 [ci skip] 2018-11-20 12:14:13 -06:00
nik707
54506f6b2c Merge pull request #7742 from deathride58/yallnwahsdontevensmokeweed 
Y'all n'wahs aint even smoke - adds skooma
 2018-11-20 12:14:09 -06:00
CitadelStationBot
2257d56b5b Automatic changelog generation for PR #7741 [ci skip] 2018-11-20 00:05:46 -06:00
nik707
251ff760ee Merge pull request #7741 from deathride58/defaultautofitviewport 
Makes auto fit viewport enabled by default for new players
 2018-11-20 00:05:43 -06:00
CitadelStationBot
a5d78781af Automatic changelog generation for PR #7743 [ci skip] 2018-11-19 22:10:27 -06:00
deathride58
a93751bc03 adds the ability to actually vote for maps instead of using tg's biased preference-based voting system (#7743) 2018-11-19 20:10:25 -08:00
Qfunk4d
870bf3347c Update chat_commands.dm (#7744) 2018-11-19 20:10:00 -08:00
CitadelStationBot
cd04b32c16 Automatic changelog generation for PR #7728 [ci skip] 2018-11-19 18:05:43 -06:00
nik707
dbe0d00cc0 Merge pull request #7728 from deathride58/drowsyebows 
Buffs ebows by making them deal 50 drowsiness
 2018-11-19 18:05:40 -06:00
CitadelStationBot
68b8e66898 Automatic changelog generation for PR #7734 [ci skip] 2018-11-19 18:05:33 -06:00
nik707
b76bb57609 Merge pull request #7734 from deathride58/fancylightingwave2 
Fancy lighting wave 2 - nonbinary colored lighting now applies to gun/helmet flashlights, borgs, bots, welders, and more
 2018-11-19 18:05:27 -06:00
CitadelStationBot
34a8f9c8c4 Automatic changelog generation for PR #7735 [ci skip] 2018-11-19 18:05:18 -06:00
nik707
7a3fec23ad Merge pull request #7735 from deathride58/abovelightinglayerairlocklights 
Moves airlock lights to the above lighting layer. They now actually glow in the dark
 2018-11-19 18:05:13 -06:00
CitadelStationBot
1cd8211b9c Automatic changelog generation for PR #7737 [ci skip] 2018-11-19 18:05:04 -06:00
nik707
025b990c1f Merge pull request #7737 from deathride58/changingvotesandseeingyourownvote 
Makes the voting system actually track who voted for what - makes it possible to change your vote and shows you what you voted for
 2018-11-19 18:05:01 -06:00
CitadelStationBot
8586b9aac9 Automatic changelog generation for PR #7738 [ci skip] 2018-11-19 18:04:46 -06:00
nik707
e3068079d6 Merge pull request #7738 from deathride58/getthefuckup 
Using help intent on someone that's in hard stamcrit will now make them heal 15 staminaloss
 2018-11-19 18:04:42 -06:00
nik707
2fa97f8089 Merge pull request #7708 from Citadel-Station-13/kevinz000-patch-8 
Gives corpses an important scientific use
 2018-11-19 13:10:50 -06:00
deathride58
313ec9cb6f removes rant comment to appease the hungersune 2018-11-19 10:13:09 -05:00
deathride58
9f7098231b y'all n'wahs don't even smoke weed - adds skooma (and adds the ability for reagents to define custom addiction stages) 2018-11-19 06:48:11 -05:00
deathride58
81aa3f6d88 Makes autofit viewport enabled by default for new players 2018-11-18 23:46:21 -05:00
Trilbyspaceclone
508f25c14d aye 2018-11-18 20:19:28 -05:00
CitadelStationBot
7aa635e71a Automatic changelog generation for PR #7736 [ci skip] 2018-11-18 18:03:03 -06:00
deathride58
857c21a378 Fixes spawners with defined job descriptions causing the mob spawners list to fill up with null entries (makes spawner menu work again and properly removes ghost roles from latejoin menu when filled) (#7736) 
* Fixes the mob spawner list being filled with null entries. (Fixes spawner menu and stops latejoin menu from showing filled ghost roles)

* oop hang on
 2018-11-18 16:03:00 -08:00
CitadelStationBot
c3584f88d0 Automatic changelog generation for PR #7739 [ci skip] 2018-11-18 17:16:45 -06:00
nik707
06f3ad7bb9 Merge pull request #7739 from Tupinambis/PubbyHotFix 
[PRIORITY] Pubby Station Air Injector Hotfix
 2018-11-18 17:16:43 -06:00
Tupinambis
e45fde5fa0 Ensures the air injectors in toxins and more importantly the SM engine actually function. 2018-11-18 17:01:16 -06:00
deathride58
a7cf00263b Merge pull request #7697 from Trilbyspaceclone/patch-7 
[Ready]Roboticist Headset in there vendor for a coin
 2018-11-18 07:50:22 -05:00
deathride58
e0cdd8fb93 Merge pull request #7678 from Trilbyspaceclone/patch-5 
[Ready] Nerfs reactive armor a bit.
 2018-11-18 07:42:42 -05:00
deathride58
500f068fe5 Merge pull request #7645 from Trilbyspaceclone/Tecweb_reblance 
[Ready] Re-balance Tech Web nodes and points
 2018-11-18 07:41:39 -05:00
deathride58
29bdaf3011 Merge pull request #7710 from Trilbyspaceclone/patch-8 
[Grammar] [Ready] Makes Space Queens men pirate gear have better item descriptions
 2018-11-18 07:39:14 -05:00
CitadelStationBot
23d83cd227 Automatic changelog generation for PR #7721 [ci skip] 2018-11-18 06:38:39 -06:00
deathride58
90776bc4c9 Merge pull request #7721 from Tupinambis/Oldstation 
Oldstation but it doesn't lag the server.
 2018-11-18 07:38:37 -05:00
deathride58
c82abfb5a9 Merge pull request #7732 from Citadel-Station-13/kevinz000-patch-18 
Cult deconversion now properly removes the blood halo
 2018-11-18 07:38:22 -05:00
CitadelStationBot
ef9ec4db88 Automatic changelog generation for PR #7733 [ci skip] 2018-11-18 06:38:13 -06:00
deathride58
6166263396 Merge pull request #7733 from R3dtail/patch-1 
Update chat_commands.dm
 2018-11-18 07:38:10 -05:00
Trilbyspaceclone
5feebdc7d3 "Better Grammar or something" 2018-11-18 06:10:23 -05:00
deathride58
ccb9e6ea90 shaking people that are laying down on the ground will now make them heal some staminaloss 2018-11-17 01:57:24 -05:00
deathride58
ad6bae5a8d Makes the voting system track what user voted for what option - makes it possible to change your vote, and shows you what you voted for. 2018-11-17 01:10:55 -05:00
Tupinambis
338a98972f Makes the ruin more of a challenge. 2018-11-16 22:34:34 -06:00
CitadelStationBot
e704840457 Automatic changelog generation for PR #7717 [ci skip] 2018-11-16 22:32:27 -06:00
deathride58
005d4d45a8 Merge pull request #7717 from Tupinambis/PubbySM 
Pubby Engineering has been redesigned with a SM engine.
 2018-11-16 23:32:25 -05:00
deathride58
a870de6b81 Merge pull request #7725 from Citadel-Station-13/kevinz000-patch-17 
slows down monkies woops my bad
 2018-11-16 23:22:03 -05:00