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

24329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kevinz000
adeb33cdae Merge pull request #9463 from Owai-Seek/minor-fixes 
Updating Kinkmate item-list
 2019-10-13 13:54:26 -07:00
CitadelStationBot
89f39a8ddb Automatic changelog generation for PR #9473 [ci skip] 2019-10-13 15:46:42 -05:00
kevinz000
32b2d629e4 Merge pull request #9473 from PersianXerxes/stopCultSpareTPing 
Set clockcult teleport in Captain's Quarters to false.
 2019-10-13 13:46:40 -07:00
kevinz000
3cd99dff1e Merge pull request #9438 from Ghommie/Ghommie-cit222 
Ports "Chat Subsystem ported from TerraGov-Marine-Corps"
 2019-10-13 08:06:40 -07:00
deathride58
0c8b82168d Merge branch 'master' into Ghommie-cit222 2019-10-12 11:20:32 -04:00
Persi
db1f459151 Set clockcult teleport in Captain's Quarters to false. 2019-10-12 03:01:52 -04:00
CitadelStationBot
f57fa7f471 Automatic changelog generation for PR #9467 [ci skip] 2019-10-11 14:34:27 -05:00
kevinz000
d33b866805 Merge pull request #9467 from deathride58/compscithree 
[s] fixes client analyzation having cid and ip swapped
 2019-10-11 12:34:25 -07:00
kevinz000
a9dcf681ce Merge pull request #9457 from Ghommie/Ghommie-cit227 
Fixing a runtime when examining unloaded cit hyposprays.
 2019-10-11 12:16:50 -07:00
deathride58
a2f5395b39 [s] fixes the client analyzation having cid and ip swapped 2019-10-11 15:16:35 -04:00
kevinz000
46994f2475 Merge pull request #9448 from MrJWhit/zombie-eyes 
Makes zombie smell through their eyes
 2019-10-11 12:16:06 -07:00
CitadelStationBot
97964a9fe8 Automatic changelog generation for PR #9374 [ci skip] 2019-10-11 14:13:51 -05:00
kevinz000
b56563fcfe Merge pull request #9374 from kappa-sama/walktime 
ashwalkers now have more messages telling them to not go on station
 2019-10-11 12:13:49 -07:00
CitadelStationBot
65db48f619 Automatic changelog generation for PR #9450 [ci skip] 2019-10-11 14:13:22 -05:00
kevinz000
e717272129 Merge pull request #9450 from JTGSZ/offsets4stuff 
Adds more control over species based offsets
 2019-10-11 12:13:19 -07:00
CitadelStationBot
a5da73edd1 Automatic changelog generation for PR #9386 [ci skip] 2019-10-11 14:13:06 -05:00
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
Winter Flare
6709dbd161 Requested Change 2019-10-11 13:25:23 -04: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
Winter Flare
2c54e7390d Update vending.dm 2019-10-11 02:54:44 -04:00
Winter Flare
7a454e448a I forgot the one item I wanted to add. 2019-10-11 02:54:23 -04:00
Winter Flare
3afbc5733c Update vending.dm 2019-10-11 01:14:09 -04: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
Winter Flare
2bce423ec3 Added a -ton- of stuff to the Kinkmate 2019-10-10 14:08:14 -04: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