shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,586 Commits 5 Branches 0 Tags
54f859fe06d171dedae172eaa8b57daa10824e43
Commit Graph
27586 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Seris02 54f859fe06 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2019-12-31 17:52:49 +08:00
CitadelStationBot 8ac23f41e6 Automatic changelog generation for PR #10365 [ci skip] 2019-12-30 22:12:58 -06:00
LinandGitHub b3144c7570 Merge pull request #10365 from Putnam3145/fix-prefs 
[s] prefs broke i fix
 2019-12-31 04:12:55 +00:00
Putnam 0b60b121c2 afwafwadjiwao 2019-12-30 19:34:57 -08:00
CitadelStationBot 5f9666d866 Automatic changelog generation for PR #10364 [ci skip] 2019-12-30 20:10:32 -06:00
Putnam3145andGitHub 1fc7722421 Merge pull request #10364 from Citadel-Station-13/kevinz000-patch-3-1 
telescopic iv drips are no longer bluespace magic
 2019-12-30 18:10:30 -08:00
kevinz000andGitHub 79c609aa40 Update telescopic_iv.dm 2019-12-30 17:55:59 -08:00
nik707andGitHub bcaaaba396 Merge pull request #10363 from Arturlang/patch-4 
[s] Fixes bloodsucker mindshield thralling
 2019-12-30 19:34:38 -06:00
ArturlangandGitHub c4caa54608 Oh god oh fuck 2019-12-31 03:23:14 +02:00
CitadelStationBot d2027c9abf Automatic changelog generation for PR #10344 [ci skip] 2019-12-30 18:31:37 -06:00
nik707andGitHub 70d03a7870 Merge pull request #10344 from Ghommie/Ghommie-cit495 
chestbursters deleting brains fix.
 2019-12-30 18:31:34 -06:00
CitadelStationBot 9538b7e664 Automatic changelog generation for PR #10338 [ci skip] 2019-12-30 18:31:09 -06:00
nik707andGitHub 5c13fa64e3 Merge pull request #10338 from Seris02/marshmallow 
marshmallow
 2019-12-30 18:31:06 -06:00
CitadelStationBot 2271246910 Automatic changelog generation for PR #10165 [ci skip] 2019-12-30 18:28:51 -06:00
nik707andGitHub 8a4e44758f Merge pull request #10165 from Ghommie/Ghommie-cit456 
Minor underwear fixes and tweaks.
 2019-12-30 18:28:48 -06:00
CitadelStationBot 8fb817b8f2 Automatic changelog generation for PR #10123 [ci skip] 2019-12-30 18:28:19 -06:00
nik707andGitHub 23f79ffed8 Merge pull request #10123 from Citadel-Station-13/throwing_disarm_stuff 
throwing now only randomly turns things if you are on harm intent
 2019-12-30 18:28:16 -06:00
CitadelStationBot 9cd2385e5c Automatic changelog generation for PR #10301 [ci skip] 2019-12-30 15:23:49 -06:00
GhomandGitHub 775ddb61e6 Merge pull request #10301 from Trilbyspaceclone/patch-249 
Buffs Engine Goggles a lot!
 2019-12-30 22:23:46 +01:00
CitadelStationBot 310de3b8cc Automatic changelog generation for PR #10357 [ci skip] 2019-12-30 14:46:41 -06:00
GhomandGitHub e5cf7430fa Merge pull request #10357 from Putnam3145/fix-prefs 
Fixes prefs
 2019-12-30 21:46:38 +01:00
Putnam d78ebd15f3 amazing. 2019-12-30 12:38:38 -08:00
CitadelStationBot 2a893caa30 Automatic changelog generation for PR #10306 [ci skip] 2019-12-30 13:11:36 -06:00
GhomandGitHub d3bf4bbb8c Merge pull request #10306 from Arturlang/patch-2 
Removes most of vampire armor and removes stun scaling, and associates the buffs with physiology
 2019-12-30 20:11:34 +01:00
ArturlangandGitHub 0776cade21 Ghommies fixes 2019-12-30 20:18:49 +02:00
CitadelStationBot f8296b53cb Automatic changelog generation for PR #10339 [ci skip] 2019-12-30 11:24:53 -06:00
GhomandGitHub e309497af2 Merge pull request #10339 from Seris02/teleivdrip 
telescopic IV drips
 2019-12-30 18:24:50 +01:00
Seris02andGitHub f0ba93052d yee2. 2019-12-30 23:53:10 +08:00
Seris02andGitHub bebd1a4600 yee. 2019-12-30 23:52:36 +08:00
GhomandGitHub bfc6687916 Merge pull request #10351 from Citadel-Station-13/changelog 
changelog.html
 2019-12-30 16:25:02 +01:00
CitadelStationBot 40ad6cb49f Automatic changelog generation for PR #10337 [ci skip] 2019-12-30 09:03:37 -06:00
GhomandGitHub 0bbae3500f Merge pull request #10337 from Seris02/autoooc 
Auto OOC
 2019-12-30 16:03:34 +01:00
Seris02 9653dc470b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into autoooc 2019-12-30 22:48:39 +08:00
Seris02andGitHub 8bb7a4a40d hnnnng 2019-12-30 19:24:07 +08:00
Seris02andGitHub bc2e4f3b5a desc 2019-12-30 19:08:37 +08:00
CitadelStationBot 557116ebd2 changelog.html 2019-12-30 10:18:47 +00:00
CitadelStationBot cef4fc9fdd Automatic changelog generation for PR #10333 [ci skip] 2019-12-30 04:18:23 -06:00
GhomandGitHub 20de4dfe50 Merge pull request #10333 from Trilbyspaceclone/patch-255 
Makes grass distill into light beer
 2019-12-30 11:18:20 +01:00
CitadelStationBot 11827be5ed Automatic changelog generation for PR #10348 [ci skip] 2019-12-30 04:08:55 -06:00
GhomandGitHub 6e506c949e Merge pull request #10348 from Putnam3145/radiation 
fix divide by 0 runtime in new contam
 2019-12-30 11:08:52 +01:00
GhomandGitHub a6e72c8cad ok 2019-12-30 11:00:21 +01:00
TrilbyspacecloneandGitHub 24d4684afb Maybe he means this? 2019-12-30 03:56:44 -05:00
CitadelStationBot 5a8380f77b Automatic changelog generation for PR #10320 [ci skip] 2019-12-30 02:26:22 -06:00
kevinz000andGitHub fef66b1bd7 Merge pull request #10320 from Seris02/exclusion 
excludes certain ghost roles from being affected by health events
 2019-12-30 00:26:19 -08:00
CitadelStationBot a406edc3fd Automatic changelog generation for PR #10331 [ci skip] 2019-12-30 02:20:38 -06:00
kevinz000andGitHub eb00538843 Merge pull request #10331 from Trilbyspaceclone/patch-254 
Buffs borg hypo's
 2019-12-30 00:20:35 -08:00
CitadelStationBot fc473f0645 Automatic changelog generation for PR #10168 [ci skip] 2019-12-30 02:17:49 -06:00
kevinz000andGitHub 7e5729ffaf Merge pull request #10168 from Ghommie/Ghommie-cit459 
Allows ghost mentors to orbit around the target instead of setting their view to theirs.
 2019-12-30 00:17:46 -08:00
CitadelStationBot 3fcf55b2ee Automatic changelog generation for PR #10239 [ci skip] 2019-12-30 02:15:06 -06:00
kevinz000andGitHub ae77577ed3 Merge pull request #10239 from Ghommie/Ghommie-cit480 
Fixing a few consistency issues with Nightmares.
 2019-12-30 00:15:03 -08:00