shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,866 Commits 5 Branches 0 Tags
f2676b1c75c7b1ca77245ea2f05d0eba4aef4c74
Commit Graph

11147 Commits

Author SHA1 Message Date
ShizCalev 6c89362f60 Fixes emitter runtime (#38796) 
fire() was already handled at 199-204
 2018-07-01 05:44:10 -05:00
deathride58 e2234a7fc4 Merge pull request #7149 from Citadel-Station-13/upstream-merge-30862 
Flashbangs no longer hurt blobs
 2018-06-26 14:07:53 -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 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
kevinz000 bae1993861 Update pipe_dispenser.dm 2018-06-25 06:19:30 -07:00
LetterJay d79b85d719 trims a few issues during mirror merges 2018-06-24 18:42:24 -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
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 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 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
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
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
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
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
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 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
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
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
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
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 6685bfcc8b Update dbcore.dm 2018-06-24 15:04:24 -05:00
Jordan Brown f1684aab2f Merge pull request #38684 from AutomaticFrenzy/patch/goonchat-logs 
Allow actually saving Goonchat logs
 2018-06-24 09:44:31 -05:00
Jordan Brown 11dc633021 Merge pull request #38692 from Jordie0608/blacklistedmakesitsoundlikethebuilddidsomethingbadwhichitdidbadbuildnaughtybuild 
Blacklisted buggy build 1428
 2018-06-24 09:16:39 -05:00
Jordan Brown 20cb09cb1c Fixes bubblegum comments 2018-06-24 05:17:22 -05:00
Jordan Brown a73bfd0913 Ports more things to Initialize (#38653) 2018-06-24 05:17:15 -05:00
Time-Green 1a53b59b12 Fixes closed soda cans transferring (#38668) 2018-06-24 05:17:00 -05:00
kevinz000 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
AnturK 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
CitadelStationBot 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
CitadelStationBot 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
Jordan Brown 6e94511718 Removes unused defines (#38650) 2018-06-22 02:04:45 -05:00
KorPhaeron 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
Tlaltecuhtli 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
kevinz000 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
Jordan Brown 4e89973d0b Merge pull request #38637 from DaxDupont/create-antag 
Makes create antags check for on station.
 2018-06-21 18:19:13 -05:00
Jordan Brown 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
YPOQ 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 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