Commit Graph

17855 Commits

Author SHA1 Message Date
deathride58
4d79c5ef09 Merge pull request #7110 from Michiyamenotehifunana/Random-Donator-Thing-1
Adds the Not-Nanotrasen Corporate Uniform and a Silver Bike Horn
2018-06-26 14:06:32 -04:00
deathride58
293f484535 Merge pull request #7108 from Citadel-Station-13/kevinz000-patch-9
removes magicarp from gold cores
2018-06-26 14:05:43 -04:00
deathride58
be532c5c7f Merge pull request #7079 from Citadel-Station-13/kevinz000-patch-7
hopefully fixes kinkmates dropping boozeomat parts
2018-06-26 14:04:27 -04:00
CitadelStationBot
e61e93bd27 Automatic changelog generation for PR #7078 [ci skip] 2018-06-26 13:04:17 -05:00
deathride58
0d522533b7 Merge pull request #7078 from Michiyamenotehifunana/powercrepe-in-nam
Adds a tiny "pocket" to the M1 Helmet (flak helmet)
2018-06-26 14:04:13 -04:00
deathride58
792943f683 Merge pull request #7034 from Trilbyspaceclone/patch-1
Adds in Oxygen to grass
2018-06-26 14:02:39 -04:00
CitadelStationBot
6b42e20e2a Automatic changelog generation for PR #7253 [ci skip] 2018-06-25 20:21:23 -05:00
CitadelStationBot
e244438443 [MIRROR] Prevents tourettes from stacking (#7253)
* fixes tourettes being cancer (#38682)

Prevents tourettes from stacking

* Prevents tourettes from stacking
2018-06-25 18:21:17 -07:00
LetterJay
791dcaac05 Merge pull request #7242 from Citadel-Station-13/kevinz000-patch-16
[s] Fixes a bug
2018-06-25 10:25:00 -05:00
kevinz000
bae1993861 Update pipe_dispenser.dm 2018-06-25 06:19:30 -07:00
LetterJay
dd03c3e104 Merge pull request #7241 from Citadel-Station-13/warning
trims a few issues during mirror merges
2018-06-24 19:08:04 -05:00
LetterJay
d79b85d719 trims a few issues during mirror merges 2018-06-24 18:42:24 -05:00
CitadelStationBot
83ec1f71d3 Automatic changelog generation for PR #7195 [ci skip] 2018-06-24 18:20:19 -05:00
LetterJay
acd10b02cf Merge pull request #7195 from Citadel-Station-13/upstream-merge-38574
[MIRROR] Global component signals
2018-06-24 18:20:17 -05:00
LetterJay
91d40042a4 Merge pull request #7181 from Citadel-Station-13/upstream-merge-38557
[MIRROR] Fix some shuttle chair stuff
2018-06-24 18:19:18 -05:00
CitadelStationBot
9fb21cc6c6 Automatic changelog generation for PR #7238 [ci skip] 2018-06-24 18:18:17 -05:00
LetterJay
629ecaa2c0 Merge pull request #7238 from Citadel-Station-13/upstream-merge-38684
[MIRROR] Allow actually saving Goonchat logs
2018-06-24 18:18:15 -05:00
LetterJay
58b6671302 Merge pull request #7237 from Citadel-Station-13/upstream-merge-38692
[MIRROR] Blacklisted buggy build 1428
2018-06-24 18:17:54 -05:00
LetterJay
9f059a2feb Merge pull request #7234 from Citadel-Station-13/upstream-merge-38661
[MIRROR] Fixes bubblegum comments
2018-06-24 18:14:03 -05:00
LetterJay
2665d0e7a9 Merge branch 'master' into upstream-merge-38661 2018-06-24 18:13:53 -05:00
LetterJay
72bc5121bd Merge pull request #7233 from Citadel-Station-13/upstream-merge-38653
[MIRROR] Ports more things to Initialize
2018-06-24 18:12:40 -05:00
LetterJay
f44cd3f917 Merge pull request #7232 from Citadel-Station-13/upstream-merge-38657
[MIRROR] Fixes fireplace sound (rogue crackle)
2018-06-24 18:12:18 -05:00
CitadelStationBot
ec5c5d0aec Automatic changelog generation for PR #7231 [ci skip] 2018-06-24 18:11:20 -05:00
LetterJay
7a473cf8c6 Merge pull request #7231 from Citadel-Station-13/upstream-merge-38668
[MIRROR] Fixes being able to transfer from closed containers to open ones
2018-06-24 18:11:18 -05:00
CitadelStationBot
7c28a43f75 Automatic changelog generation for PR #7230 [ci skip] 2018-06-24 16:40:46 -05:00
LetterJay
e0eac87b81 Merge pull request #7230 from Citadel-Station-13/upstream-merge-38617
[MIRROR] Cyborgs now drop radio keys on detonation/destruction
2018-06-24 16:40:44 -05:00
LetterJay
5212877dfc Merge pull request #7229 from Citadel-Station-13/upstream-merge-38658
[MIRROR] Fixes antag logs
2018-06-24 16:40:35 -05:00
LetterJay
4177d3664b Merge pull request #7224 from Citadel-Station-13/upstream-merge-38650
[MIRROR] Removes unused undefs
2018-06-24 16:40:09 -05:00
CitadelStationBot
e6b56284ce Automatic changelog generation for PR #7222 [ci skip] 2018-06-24 16:37:52 -05:00
LetterJay
6accc4e690 Merge pull request #7222 from Citadel-Station-13/upstream-merge-38306
[MIRROR] Bubblegum is scarier again
2018-06-24 16:37:49 -05:00
LetterJay
269a375927 Merge pull request #7221 from Citadel-Station-13/upstream-merge-38321
[MIRROR] [READY] better contraband crates
2018-06-24 15:33:05 -05:00
CitadelStationBot
df31333299 Automatic changelog generation for PR #7220 [ci skip] 2018-06-24 15:32:51 -05:00
LetterJay
057350d7dc Merge pull request #7220 from Citadel-Station-13/upstream-merge-38093
[MIRROR] Fixes and adds blast cannons to traitor science uplink items
2018-06-24 15:32:49 -05:00
CitadelStationBot
9f160ef045 Automatic changelog generation for PR #7219 [ci skip] 2018-06-24 15:22:03 -05:00
LetterJay
2b1d86629a Merge pull request #7219 from Citadel-Station-13/upstream-merge-38637
[MIRROR] Makes create antags check for on station.
2018-06-24 15:22:00 -05:00
CitadelStationBot
60b0ac583f Automatic changelog generation for PR #7218 [ci skip] 2018-06-24 15:16:54 -05:00
LetterJay
0c9ce40871 Merge pull request #7218 from Citadel-Station-13/upstream-merge-38633
[MIRROR] potency gene disks now clarify what the % means on examine
2018-06-24 15:16:51 -05:00
LetterJay
0a28cbdfc4 Merge pull request #7217 from Citadel-Station-13/upstream-merge-38570
[MIRROR] Fixes gulag stacker not giving points after RPG loot event
2018-06-24 15:16:35 -05:00
LetterJay
8f7ca9fbba Merge pull request #7211 from Citadel-Station-13/upstream-merge-38534
[MIRROR] Fixes AI's being unable to call shuttle using comm console.
2018-06-24 15:16:09 -05:00
LetterJay
fe447b96b2 Merge pull request #7210 from Citadel-Station-13/upstream-merge-38619
[MIRROR] Trims down apt dependencies
2018-06-24 15:15:20 -05:00
LetterJay
7e84223efd Merge pull request #7202 from Citadel-Station-13/upstream-merge-38605
[MIRROR] Micro-optimization to update_corners()
2018-06-24 15:12:05 -05:00
CitadelStationBot
3d393bc8c4 Automatic changelog generation for PR #7201 [ci skip] 2018-06-24 15:11:46 -05:00
LetterJay
701f2fde31 Merge pull request #7201 from Citadel-Station-13/upstream-merge-38153
[MIRROR] Equalizes Roundstart Mining Options (Removes some Advanced Scanners and Explorer Webbings)
2018-06-24 15:11:41 -05:00
LetterJay
922e2a4515 Merge pull request #7200 from Citadel-Station-13/upstream-merge-38584
[MIRROR] Adds /datum/DBQuery/proc/SetQuery
2018-06-24 15:11:23 -05:00
LetterJay
a3a4ecffbe Update components.dm 2018-06-24 15:08:37 -05:00
CitadelStationBot
56df9b0ac3 Automatic changelog generation for PR #7190 [ci skip] 2018-06-24 15:07:56 -05:00
LetterJay
ce9d797ac5 Merge pull request #7190 from Citadel-Station-13/upstream-merge-38577
[MIRROR] PDA can be ctrl-clicked to remove the item in its pen slot
2018-06-24 15:07:54 -05:00
CitadelStationBot
4c0b6e4642 Automatic changelog generation for PR #7189 [ci skip] 2018-06-24 15:07:37 -05:00
LetterJay
ecbe355b4b Merge pull request #7189 from Citadel-Station-13/upstream-merge-38580
[MIRROR] Adds a pink scarf
2018-06-24 15:07:34 -05:00
CitadelStationBot
06fe499189 Automatic changelog generation for PR #7188 [ci skip] 2018-06-24 15:07:16 -05:00