shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,298 Commits 5 Branches 0 Tags
bcc92d234bc67770637745c5ad4eccdef25ecaeb
Commit Graph

24298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kevinz000
bcc92d234b Merge pull request #9386 from Sishen1542/suitrad 
Gives suit storage units the ability to remove radiation from mobs
 2019-10-11 12:13:04 -07:00
CitadelStationBot
4eb7f90eb2 Automatic changelog generation for PR #9387 [ci skip] 2019-10-11 14:11:52 -05:00
kevinz000
0643a7b230 Merge pull request #9387 from Sishen1542/goose 
the geese have been unleased
 2019-10-11 12:11:50 -07:00
kevinz000
62e11c79b4 Merge pull request #9403 from Poojawa/patch-3 
Updates Config with Citadel specific links & info
 2019-10-11 12:11:19 -07:00
kevinz000
9120e4b7c8 Merge pull request #9399 from Arturlang/patch-1 
[s] Adds a distance check to the supermatter tongs consume action, ported from TG
 2019-10-11 12:10:53 -07:00
CitadelStationBot
2adbd72cab Automatic changelog generation for PR #9441 [ci skip] 2019-10-11 14:10:33 -05:00
kevinz000
b0b274762c Merge pull request #9441 from lolman360/whydowehave1000branches 
Ports /tg/ advanced surgerytools and tool defines.
 2019-10-11 12:10:31 -07:00
CitadelStationBot
506d66ea17 Automatic changelog generation for PR #9435 [ci skip] 2019-10-11 14:09:16 -05:00
kevinz000
9cd75c82a4 Merge pull request #9435 from Linzolle/firefix 
fix fireman carry offhand not automatically deleting itself
 2019-10-11 12:09:14 -07:00
CitadelStationBot
546a52ac04 Automatic changelog generation for PR #9437 [ci skip] 2019-10-11 14:08:59 -05:00
kevinz000
620af601b2 Merge pull request #9437 from JTGSZ/clothingrestrictions 
Optional Species based clothing restrictions
 2019-10-11 12:08:57 -07:00
CitadelStationBot
02defe6640 Automatic changelog generation for PR #9442 [ci skip] 2019-10-11 14:08:46 -05:00
kevinz000
4ab08802a1 Merge pull request #9442 from YakumoChen/air-hog 
Reverts jetpack efficiency from #9307
 2019-10-11 12:08:44 -07:00
CitadelStationBot
d19385fb4b Automatic changelog generation for PR #9444 [ci skip] 2019-10-11 14:08:14 -05:00
kevinz000
2e74833e72 Merge pull request #9444 from Thalpy/Updates-holder 
[Testmerge first] [Ready] Cleans up holder.dm code and fixes some of the cross bugs from shotgun PR merging.
 2019-10-11 12:08:12 -07:00
CitadelStationBot
cc607b257d Automatic changelog generation for PR #9459 [ci skip] 2019-10-11 14:05:55 -05:00
kevinz000
98d03c73be Merge pull request #9459 from dapnee/Imagine-people-reading-code-to-see-if-it-forgets-something 
Imagine Updating How Tables Work, But Forgetting MY TABLES
 2019-10-11 12:05:53 -07:00
CitadelStationBot
929556004f Automatic changelog generation for PR #9451 [ci skip] 2019-10-11 14:05:14 -05:00
kevinz000
1896b43c79 Merge pull request #9451 from Ghommie/Ghommie-cit224 
standarizes mobs' can_equip arguments.
 2019-10-11 12:05:12 -07:00
CitadelStationBot
1fbb3519a1 Automatic changelog generation for PR #9458 [ci skip] 2019-10-11 14:04:51 -05:00
kevinz000
9805e1b5fb Merge pull request #9458 from Ghommie/Ghommie-cit228 
Nerfs cyborg disabler to hold 25 shots rather than 43, just like a normal disabler.
 2019-10-11 12:04:49 -07:00
Fermi
f165b5e813 darn nutrients. 2019-10-11 18:58:53 +01:00
Sishen
c51bfc153b b 2019-10-11 13:24:00 -04:00
YakumoChen
55e7645773 updating branch 2019-10-11 04:55:57 -04:00
YakumoChen
8591cba9a0 Merge pull request #6 from Citadel-Station-13/master 
update
 2019-10-11 04:53:36 -04:00
Thalpy
e517ece612 Darnit beaker 2019-10-11 08:41:08 +01:00
deathride58
ae843435f0 Merge pull request #9460 from Ghommie/Ghommie-cit230 
quickfixes lowpop nuclear war tc malus calculation.
 2019-10-10 15:20:20 -04:00
Ghommie
e734b36ee3 quickfixes lowpop nuclear war tc malus calculation. 2019-10-10 20:54:19 +02:00
Dap
293034d815 Imagine Updating How Tables Work, But Forgetting MY TABLES 
## About The Pull Request

Let me just add in a single line so plasmaglass tables actually work.

## Changelog
🆑
fix: You can now make plasmaglass tables again.
/🆑
 2019-10-10 09:04:06 -06:00
CitadelStationBot
1d2b935104 Automatic changelog generation for PR #9324 [ci skip] 2019-10-10 04:23:17 -05:00
kevinz000
3e6415d4b5 Merge pull request #9324 from Linzolle/crusher 
Ports "Adds toggleable light and blinking charging light to crusher" and "Lets the kinetic crusher be one-hand carried"
 2019-10-10 02:23:15 -07:00
CitadelStationBot
aece7b8840 Automatic changelog generation for PR #9412 [ci skip] 2019-10-10 04:21:34 -05:00
kevinz000
0f74a735cb Merge pull request #9412 from Ghommie/Ghommie-cit213 
Ports "Makes supermatter melt walls if it finds itself in one"
 2019-10-10 02:21:32 -07:00
kevinz000
d9ff4235eb Merge pull request #9447 from Ghommie/Ghommie-cit223 
No digitigrade plasmaman suits sprites for the time being, thank you.
 2019-10-10 02:20:45 -07:00
CitadelStationBot
97e7435425 Automatic changelog generation for PR #9257 [ci skip] 2019-10-10 04:19:20 -05:00
kevinz000
fda64df569 Merge pull request #9257 from Thalpy/Blind-quirk-without-anger 
[READY] Blind quirk without anger
 2019-10-10 02:19:17 -07:00
CitadelStationBot
59ba51d865 Automatic changelog generation for PR #9368 [ci skip] 2019-10-10 04:18:27 -05:00
kevinz000
89747a3a6e Merge pull request #9368 from Seris02/master 
Fixes luminescent dark blue major effect and changes the "autoprocess" button to "autoclone"
 2019-10-10 02:18:25 -07:00
CitadelStationBot
1bbc837b9a Automatic changelog generation for PR #9415 [ci skip] 2019-10-10 04:13:27 -05:00
kevinz000
6e029c3360 Merge pull request #9415 from Ghommie/Ghommie-cit214 
Removes the minimum player cap for the war ops in favour or a more proportional telecrystal bonus.
 2019-10-10 02:13:25 -07:00
CitadelStationBot
3e1e6a18d0 Automatic changelog generation for PR #9439 [ci skip] 2019-10-10 04:12:57 -05:00
kevinz000
b233d3556e Merge pull request #9439 from JTGSZ/dominatorfix 
Fixes Dominator countdown continuing after BoH movement, tweaks view amount
 2019-10-10 02:12:55 -07:00
CitadelStationBot
70983ac6e4 Automatic changelog generation for PR #9432 [ci skip] 2019-10-10 04:12:43 -05:00
kevinz000
fb028b7997 Merge pull request #9432 from Putnam3145/pandemic-qol 
Made PanD.E.M.I.C beaker stuff more like ChemMaster
 2019-10-10 02:12:41 -07:00
CitadelStationBot
b9e688f615 Automatic changelog generation for PR #9446 [ci skip] 2019-10-10 04:11:19 -05:00
kevinz000
f791b399a0 Merge pull request #9446 from Sishen1542/ung 
abscond can no longer be cast from inside a locker
 2019-10-10 02:11:17 -07:00
kevinz000
c4f8956985 Merge pull request #9433 from Poojawa/hoss-tails 
Corrects a missing tail state
 2019-10-10 02:10:31 -07:00
CitadelStationBot
fbf6dce1b4 Automatic changelog generation for PR #9452 [ci skip] 2019-10-10 04:10:10 -05:00
kevinz000
236dcc4d63 Merge pull request #9452 from Ghommie/Ghommie-cit225 
Stops non-alphanumeric graffiti decals from being named "letter".
 2019-10-10 02:10:08 -07:00
CitadelStationBot
cbbbc13861 Automatic changelog generation for PR #8615 [ci skip] 2019-10-10 04:09:54 -05:00