shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,802 Commits 5 Branches 0 Tags
5212877dfc5c7ca3a0eb82dd9b5e92600c602557
Commit Graph
17802 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
KorPhaeronandletterjay fa06a729a2 Bubblegum is scarier again (#38306) 
Miners are able to kill him roundstart by just walking backwards while shooting. Weaker than an ash drake.

Easiest way to change this was to give him his original attacks back which required you to avoid/manage blood.
 2018-06-21 18:56:28 -05:00
letterjay 2679c7ee29 [READY] better contraband crates 2018-06-21 18:52:15 -05:00
Tlaltecuhtliandletterjay 01eb1bc7fe [READY] better contraband crates (#38321) 
feature: NT reports that the local contraband market has expanded, experts say that the Syndicate is involved.
 2018-06-21 18:52:15 -05:00
letterjay ac4fdb930c Fixes and adds blast cannons to traitor science uplink items 2018-06-21 18:38:46 -05:00
kevinz000andletterjay 561c2179f8 Fixes and adds blast cannons to traitor science uplink items (#38093) 
rscadd: Blast cannons have been fixed and are now available for purchase by traitorous scientists for a low low price of 14TC.
rscadd: Blast cannons take the explosive power of a TTV bomb and ejects a linear projectile that will apply what the bomb would do to a certain tile at that distance to that tile. However, this will not cause breaches, or gib mobs, unless the gods (admins) so will it.
experimental: Blast cannons do not respect maxcap. (Unless the admins so will it.)
 2018-06-21 18:38:46 -05:00
letterjay 31773a150c Makes create antags check for on station. 2018-06-21 18:19:13 -05:00
Jordan Brownandletterjay 4e89973d0b Merge pull request #38637 from DaxDupont/create-antag 
Makes create antags check for on station.
 2018-06-21 18:19:13 -05:00
letterjay e1ea356aae potency gene disks now clarify what the % means on examine 2018-06-21 16:54:20 -05:00
Jordan Brownandletterjay 16bd86e4cb Merge pull request #38633 from ExcessiveUseOfCobblestone/patch-46 
potency gene disks now clarify what the % means on examine
 2018-06-21 16:54:20 -05:00
letterjay 4c1a9789ac Fixes gulag stacker not giving points after RPG loot event 2018-06-21 16:30:40 -05:00
YPOQandletterjay a6cfd22b79 Fixes gulag stacker not giving points after RPG loot event (#38570) 
* Fixes gulag stacker not giving points after RPG loot event

* Moves point values to type vars

* cleanup
 2018-06-21 16:30:39 -05:00
CitadelStationBot d0f68daa21 Automatic changelog generation for PR #7207 [ci skip] 2018-06-21 00:40:56 -05:00
CitadelStationBotandkevinz000 f393d68499 [MIRROR] fixes anomaly cores being flamable (#7207) 
* fixes anomaly cores being flamable (#38607)

* oranges-is-gay

* swap

* fixes anomaly cores being flamable
 2018-06-20 22:40:54 -07:00
CitadelStationBotandkevinz000 3d1faff99b [MIRROR] Adds desc to IV drips (#7205) 
* Merge pull request #38608 from 81Denton/iv-drip-desc

Adds desc to IV drips

* Adds desc to IV drips
 2018-06-20 22:39:29 -07:00
letterjay f00c80f373 Fixes AI's being unable to call shuttle using comm console. 2018-06-20 19:39:17 -05:00
AnturKandletterjay 5e156e7a07 Fixes AI's being unable to call shuttle using comm console. (#38534) 
* Fixes AI's being unable to call shuttle using comm console.

* Lets get rid of double negatives

* viewvers for
 2018-06-20 19:39:17 -05:00