shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,818 Commits 5 Branches 0 Tags
2665d0e7a9532ac3f57d675db748fa7a9c84d48e
Commit Graph
17818 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub 2665d0e7a9 Merge branch 'master' into upstream-merge-38661 2018-06-24 18:13:53 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 5212877dfc Merge pull request #7229 from Citadel-Station-13/upstream-merge-38658 
[MIRROR] Fixes antag logs
 2018-06-24 16:40:35 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
CitadelStationBot 56df9b0ac3 Automatic changelog generation for PR #7190 [ci skip] 2018-06-24 15:07:56 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 06c7cebb82 Merge pull request #7188 from Citadel-Station-13/upstream-merge-38319 
[MIRROR] [READY] Helps data disks stop being unemployed
 2018-06-24 15:07:14 -05:00
LetterJayandGitHub fc3ed3716d Merge pull request #7187 from Citadel-Station-13/upstream-merge-38576 
[MIRROR] Fixes alternative method of removing legcuffs.
 2018-06-24 15:06:21 -05:00
LetterJayandGitHub 582b9f2a75 Merge pull request #7186 from Citadel-Station-13/upstream-merge-38592 
[MIRROR] [s] Fixes direct sql datum call exploit.
 2018-06-24 15:06:02 -05:00
LetterJayandGitHub 6685bfcc8b Update dbcore.dm 2018-06-24 15:04:24 -05:00
Jordan Brownandletterjay 20cb09cb1c Fixes bubblegum comments 2018-06-24 05:17:22 -05:00
letterjay e0dc509f5d Ports more things to Initialize 2018-06-24 05:17:15 -05:00
Jordan Brownandletterjay a73bfd0913 Ports more things to Initialize (#38653) 2018-06-24 05:17:15 -05:00
letterjay 155fbd33ad Fixes fireplace sound (rogue crackle) 2018-06-24 05:17:08 -05:00
NikNakFlakandletterjay f2d665b1b1 Fixes fireplace sound (rogue crackle) (#38657) 2018-06-24 05:17:07 -05:00
letterjay 9bba3bc2bb Fixes being able to transfer from closed containers to open ones 2018-06-24 05:17:00 -05:00
Time-Greenandletterjay 1a53b59b12 Fixes closed soda cans transferring (#38668) 2018-06-24 05:17:00 -05:00
letterjay 6bf7cc58dd Cyborgs now drop radio keys on detonation/destruction 2018-06-24 05:16:18 -05:00
kevinz000andletterjay 4ffe025624 Cyborgs now drop radio keys on detonation/destruction (#38617) 
* Cyborgs now drop radio keys on detonation/destruction

* Woops!

* Update robot.dm

* Use atom rather than turf
 2018-06-24 05:16:18 -05:00
letterjay d967f48ee4 Fixes antag logs 2018-06-24 05:16:06 -05:00
AnturKandletterjay 843c05aa82 Fixes antag logs (#38658) 
* Fixes roundstart antag logging.

* Fixes roundend antag logging.

* Handles blown up minds.

* whoops

* total antag cleanup
 2018-06-24 05:16:06 -05:00
CitadelStationBotandkevinz000 386bc528ea [MIRROR] Add logging to teleport and the teleporter destination setting (#7225) 
* Add logging to teleport and the teleporter destination setting (#38645)

Helps with some admin issues

* Add logging to teleport and the teleporter destination setting
 2018-06-22 00:34:41 -07:00
CitadelStationBotandkevinz000 f02a99f901 [MIRROR] Fixes HE pipes not respecting layering (#7223) 
* Fixes HE pipes not respecting layering (#38468)

* HE pipes fix

* Heat exchange stuff

* Fixes HE pipes not respecting layering
 2018-06-22 00:16:50 -07:00
letterjay c3a09926a1 Removes unused undefs 2018-06-22 02:04:45 -05:00
Jordan Brownandletterjay 6e94511718 Removes unused defines (#38650) 2018-06-22 02:04:45 -05:00
letterjay b8e85f1773 Bubblegum is scarier again 2018-06-21 18:56:29 -05:00