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

6683 Commits

Author SHA1 Message Date
LetterJay
3dfeb02512 Merge pull request #7245 from Citadel-Station-13/upstream-merge-38697 
[MIRROR] Improves machine overload logging
 2018-07-01 09:25:40 -05:00
LetterJay
8e21d77c4d Merge pull request #7244 from Citadel-Station-13/upstream-merge-38696 
[MIRROR] fixes a cult message.fixes a cult message.
 2018-07-01 09:25:21 -05:00
LetterJay
605f7a1bf6 Merge pull request #7240 from Citadel-Station-13/upstream-merge-38675 
[MIRROR] Fixed cyborgs not getting their names at round start
 2018-07-01 09:24:46 -05:00
deathride58
792943f683 Merge pull request #7034 from Trilbyspaceclone/patch-1 
Adds in Oxygen to grass
 2018-06-26 14:02:39 -04:00
Jordan Brown
6579450176 Merge pull request #38697 from DaxDupont/a 
Improves machine overload logging
 2018-06-25 09:15:25 -05:00
Jordan Brown
c97abeaf09 Merge pull request #38696 from Tlaltecuhtli/patch-53 
fixes a cult message.fixes a cult message.
 2018-06-25 09:15:17 -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
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
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
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
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
CitrusGender
d50ae43d7f Fixed cyborgs not getting their names at round start 2018-06-24 13:55:03 -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
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
Jordan Brown
05995f5774 Merge pull request #38605 from vuonojenmustaturska/tinylight 
Micro-optimization to update_corners()
 2018-06-20 09:25:18 -05:00
Grandmother of 50
2fefc185d3 Equalizes Roundstart Mining Options (Removes some Advanced Scanners and Explorer Webbings) (#38153) 2018-06-20 02:43:42 -05:00
Jordan Brown
c11557d23d Global component signals 2018-06-19 17:18:34 -05:00
CitadelStationBot
49a34614cd [MIRROR] Admin Kicks now prompt the admin to avoid accidental kicking (#7191) 
* Admin Kicks now prompt the admin to avoid accidental kicking (#38544)

* TO THE PLAAAAAACE I BELOOOOOONG

* TAKE ME HOOOOOOOOOOME

* WEEEEEEST VIRGINIAAAAAAAAAAAAAAAAAAA

* fixes my shit

* No meming in admin frontend

* Admin Kicks now prompt the admin to avoid accidental kicking
 2018-06-19 14:51:14 -07:00
Jordan Brown
1ee84bb7d2 Merge pull request #38580 from Hyacinth-OR/pinkscarf 
Adds a pink scarf
 2018-06-19 09:49:28 -05:00
JStheguy
02744c59a5 [READY] Helps data disks stop being unemployed (#38319) 
* data cards actually have a function now

* Adds data cards to the IC printer for real rea

* more cards, less shitty code

* how the fuck did I miss that

adds a missing ..()

* wait wrong use of ..() fuck
 2018-06-19 09:23:33 -05:00
Jordan Brown
8115f0acda Merge pull request #38576 from AnturK/runtimeL 
Fixes alternative method of removing legcuffs.
 2018-06-19 09:19:15 -05:00
deathride58
7150c207aa Fixes a merge conflict 2018-06-19 07:30:52 -04:00
LetterJay
e448002390 Merge pull request #7177 from Citadel-Station-13/upstream-merge-38555 
[MIRROR] Dsay now shows admin rank instead of ADMIN
 2018-06-18 22:01:42 -05:00