shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,703 Commits 5 Branches 0 Tags
deeceafb7736407bfd358af307d8515399d9a4e7
Commit Graph

23703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Linzolle
deeceafb77 cult fixes 2019-09-20 16:38:37 -05:00
CitadelStationBot
8182eda2cb Automatic changelog generation for PR #9203 [ci skip] 2019-09-20 14:09:36 -05:00
kevinz000
9108c1ce89 Merge pull request #9203 from Trilbyspaceclone/fancy 
Makes brass tools look better*
 2019-09-20 12:09:33 -07:00
kevinz000
18afb348fe Merge pull request #9294 from Poojawa/patch-1 
Updates Travis to 512.1484
 2019-09-19 10:25:32 -07:00
CitadelStationBot
65bcf40c9a Automatic changelog generation for PR #9099 [ci skip] 2019-09-19 12:22:02 -05:00
kevinz000
0694dce05e Merge pull request #9099 from Thalpy/NeuroFix 
[Ready] [Please merge me] Fixes Neurotoxin and makes it a fermireaction. Additionally merges Fermireactions mechanics with all chems, making it possible for people to port chems over.
 2019-09-19 10:21:59 -07:00
Fermi
df4da58ce8 Merge branch 'NeuroFix' of https://github.com/Thalpy/Citadel-Station-13 into NeuroFix 2019-09-19 01:46:32 +01:00
Fermi
08eeda97f5 Heck 2019-09-19 01:45:21 +01:00
Thalpy
18ce46d7ec Merge branch 'master' into NeuroFix 2019-09-19 01:44:09 +01:00
CitadelStationBot
2c70bd097c Automatic changelog generation for PR #9295 [ci skip] 2019-09-18 00:03:31 -05:00
kevinz000
a6f4548349 Merge pull request #9295 from Ghommie/Ghommie-cit196 
Raising police baton and tele baton cooldown from 0.8 to 1.4 seconds.
 2019-09-17 22:03:29 -07:00
CitadelStationBot
aa610617f8 Automatic changelog generation for PR #9302 [ci skip] 2019-09-18 00:01:02 -05:00
kevinz000
2cf1e6ff85 Merge pull request #9302 from deathride58/jobcodesanitychecks 
fixes roundstart runtimes by job_preferences index checks be explicit key checks instead, plus some extra sanity checks
 2019-09-17 22:00:59 -07:00
kevinz000
893f82f6bf Merge pull request #9303 from Ghommie/Ghommie-cit198 
Making sure #9301 works, speedmerging cut this commit out.
 2019-09-17 21:59:29 -07:00
Ghommie
8bf4d5754e I'm a moron. 2019-09-18 04:23:52 +02:00
deathride58
18e97451a3 Merge branch 'master' into jobcodesanitychecks 2019-09-17 22:15:09 -04:00
BlackMajor
2c0ab567fa Merge pull request #9301 from Ghommie/Ghommie-cit198 
flex-taping the gamebreaking bug with savefiles prefs.
 2019-09-18 14:14:22 +12:00
deathride58
cc6e436e96 further fixes 2019-09-17 21:48:48 -04:00
deathride58
d0296a5e81 fixes roundstart runtimes by job_preferences index checks be explicit key checks instead, plus some extra sanity checks 2019-09-17 20:15:06 -04:00
Ghommie
150da1d34a code quality 2019-09-18 01:37:17 +02:00
Ghommie
63fbf225a6 aaaaa 2019-09-18 01:24:44 +02:00
Ghommie
040b6472b4 FUCK 2019-09-18 01:21:18 +02:00
Ghommie
5e52c62f29 actual balance. 2019-09-17 03:41:53 +02:00
CitadelStationBot
9d32611e64 Automatic changelog generation for PR #9277 [ci skip] 2019-09-16 17:25:34 -05:00
BlackMajor
adb3d6704b Merge pull request #9277 from Poojawa/are-those-horns-are-are-you-just-retarded 
Adding Horn colors, Alternate Digi Leg framework, and species squash
 2019-09-17 10:25:31 +12:00
Ghommie
0d9b284784 unneeded variable, no gameplay changes. 2019-09-16 18:12:05 +02:00
Ghommie
ca95d39a46 Slowing down police baton and tele baton speed. 2019-09-16 17:47:22 +02:00
Poojawa
6668630649 Merge branch 'master' into are-those-horns-are-are-you-just-retarded 2019-09-15 23:25:22 -05:00
Poojawa
a739342a5a Updates Travis to 512.1484 
just so everything is checked with the DMI fixes. and various other updates.
 2019-09-15 23:21:27 -05:00
BlackMajor
5a58ac6875 Merge pull request #9027 from Poojawa/job-menu-improvements 
Job menu improvements Except maybe Kevin will merge it this time instead of a month later
 2019-09-16 16:19:42 +12:00
CitadelStationBot
10a632ae26 Automatic changelog generation for PR #9288 [ci skip] 2019-09-14 17:55:46 -05:00
kevinz000
f3592a54a7 Merge pull request #9288 from Trilbyspaceclone/patch-227 
Fixes orical UI being broken and taking modular files that are not a thing
 2019-09-14 15:55:43 -07:00
CitadelStationBot
e1ad3ececa Automatic changelog generation for PR #9289 [ci skip] 2019-09-14 17:55:27 -05:00
kevinz000
c8ba927449 Merge pull request #9289 from Sishen1542/moscl 
chem fix for strained muscles edge cases
 2019-09-14 15:55:24 -07:00
Sishen
5159a58fef Update strained_muscles.dm 2019-09-14 12:00:28 -04:00
Trilbyspaceclone
bad8a816ab Update themed.dm 2019-09-14 06:51:19 -04:00
Poojawa
bf3d30c0e4 Seperates Insect fluff from wings 
Fluff can be the new body markings I guess.
 2019-09-14 04:27:38 -05:00
Poojawa
0417c0d6af Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-09-13 23:28:08 -05:00
Poojawa
0faafe8deb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded 2019-09-13 23:26:27 -05:00
CitadelStationBot
cc462d7fa0 Automatic changelog generation for PR #9109 [ci skip] 2019-09-13 23:20:48 -05:00
kevinz000
ea43b941eb Merge pull request #9109 from Trilbyspaceclone/fruit 
Adds Catnip plants and tea
 2019-09-13 21:20:46 -07:00
Poojawa
344ccaf20d cleans up some other species related stuff, unmodularizes some code 2019-09-13 22:18:53 -05:00
Trilbyspaceclone
5b2dba354a Merge branch 'master' into fruit 2019-09-13 14:00:11 -04:00
Poojawa
f0afc9c490 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-09-13 12:59:15 -05:00
Poojawa
9376bfb44d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded 2019-09-13 12:56:57 -05:00
CitadelStationBot
b2cde8e121 Automatic changelog generation for PR #9199 [ci skip] 2019-09-13 12:47:17 -05:00
kevinz000
39beca1a0f Merge pull request #9199 from Tupinambis/IUsedTheShotgunYouKnowWhy 
I Used The Shotgun, You Know Why? (Shotgun Balance Pass)
 2019-09-13 10:47:15 -07:00
CitadelStationBot
ed2e73d817 Automatic changelog generation for PR #9241 [ci skip] 2019-09-13 12:46:13 -05:00
kevinz000
e107c51e19 Merge pull request #9241 from Linzolle/oracleui 
Ports Oracle UI framework, and updates UI for paper and disposal bins.
 2019-09-13 10:46:11 -07:00
CitadelStationBot
c0f40fc096 Automatic changelog generation for PR #9279 [ci skip] 2019-09-13 12:43:45 -05:00