shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,533 Commits 5 Branches 0 Tags
5fca9331f612e77cbf6045fc430febcc74355929
Commit Graph
13533 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jordan BrownandCitadelStationBot 5fca9331f6 Merge pull request #35509 from DaxDupont/too-much-assblast 
Removes duplicate air alarm on meta.
 2018-02-11 11:36:36 -06:00
CitadelStationBotandGitHub a55e4a3f90 Merge pull request #5413 from Citadel-Station-13/upstream-merge-35421 
[MIRROR] Ruins now log to world only in TESTING mode
 2018-02-11 09:44:26 -06:00
CitadelStationBot 2f49e98975 Automatic changelog generation for PR #5419 [ci skip] 2018-02-11 09:44:08 -06:00
CitadelStationBotandGitHub 6de4146031 Merge pull request #5419 from Citadel-Station-13/upstream-merge-35504 
[MIRROR] Removes that annoying clunking steam engine ambience sound that's probably from a youtube video
 2018-02-11 09:44:06 -06:00
CitadelStationBotandGitHub 9025a3df29 Merge pull request #5418 from Citadel-Station-13/upstream-merge-35502 
[MIRROR] pet carriers can be actually made
 2018-02-11 09:43:17 -06:00
CitadelStationBot 2c162a48a7 Automatic changelog generation for PR #5409 [ci skip] 2018-02-11 09:43:12 -06:00
CitadelStationBotandGitHub 51d15518ae Merge pull request #5409 from Citadel-Station-13/upstream-merge-35456 
[MIRROR] [s] Fixes altclick exploits
 2018-02-11 09:43:09 -06:00
CitadelStationBotandGitHub 81dcb41a4d Merge pull request #5417 from Citadel-Station-13/upstream-merge-35516 
[MIRROR] [s]Blacklists the most recent version of byond for basically being a wall hack
 2018-02-11 07:38:54 -06:00
CitadelStationBot 7f135fb5ca Automatic changelog generation for PR #5416 [ci skip] 2018-02-11 07:38:39 -06:00
CitadelStationBotandGitHub 74c083fc89 Merge pull request #5416 from Citadel-Station-13/upstream-merge-35188 
[MIRROR] Adds a SCP-294 ruin
 2018-02-11 07:38:37 -06:00
CitadelStationBot 3ed32bc35f Automatic changelog generation for PR #5415 [ci skip] 2018-02-11 07:38:16 -06:00
CitadelStationBotandGitHub f3569cf023 Merge pull request #5415 from Citadel-Station-13/upstream-merge-35235 
[MIRROR] Mining sentience upgrade grants minebots a radio and ID
 2018-02-11 07:38:14 -06:00
CitadelStationBot 1d9c08ca9d Automatic changelog generation for PR #5414 [ci skip] 2018-02-11 07:38:09 -06:00
CitadelStationBotandGitHub 088ad78f95 Merge pull request #5414 from Citadel-Station-13/upstream-merge-35376 
[MIRROR] Buildable Shuttle/Plastitanium Windows
 2018-02-11 07:38:06 -06:00
CitadelStationBotandGitHub 5b1880fd47 Update artefact.dm 2018-02-11 07:37:25 -06:00
CitadelStationBot 70b1e5897a Removes that annoying clunking steam engine ambience sound that's probably from a youtube video 2018-02-11 07:36:25 -06:00
LeoandCitadelStationBot 4195cf4491 Merge pull request #35504 from vuonojenmustaturska/delambieng1 
Removes that annoying clunking steam engine ambience sound that's probably from a youtube video
 2018-02-11 07:36:24 -06:00
CitadelStationBot 1b907288c9 pet carriers can be actually made 2018-02-11 07:34:51 -06:00
LeoandCitadelStationBot b55fd38680 Merge pull request #35502 from Tlaltecuhtli/patch-1 
pet carriers can be actually made
 2018-02-11 07:34:51 -06:00
CitadelStationBot 9864862418 Automatic changelog generation for PR #5412 [ci skip] 2018-02-11 05:37:28 -06:00
CitadelStationBotandGitHub 092370e366 Merge pull request #5412 from Citadel-Station-13/upstream-merge-35451 
[MIRROR] Buildable and upgradable All-In-One Grinder (again)
 2018-02-11 05:37:26 -06:00
CitadelStationBot 7288abe554 Automatic changelog generation for PR #5410 [ci skip] 2018-02-11 05:37:08 -06:00
CitadelStationBotandGitHub f4f9906cc5 Merge pull request #5410 from Citadel-Station-13/upstream-merge-35462 
[MIRROR] Grabbers can now only contain things smaller than the assembly.
 2018-02-11 05:37:06 -06:00
CitadelStationBotandGitHub a60e56597c Update soft_caps.dm 2018-02-11 05:35:55 -06:00
CitadelStationBot e5b64b7c76 [s]Blacklists the most recent version of byond for basically being a wall hack 2018-02-11 05:14:05 -06:00
Kyle Spier-SwensonandCitadelStationBot affcbcd609 [s]Blacklists the most recent version of byond for basically being a wall hack (#35516) 
* Blacklisted client builds.

* Missed a spot

* glob was a mistake
 2018-02-11 05:14:04 -06:00
MoreRobustThanYouandCitadelStationBot 73c1088d5a Adds a SCP-294 ruin 2018-02-11 05:13:56 -06:00
CitadelStationBot 5aaff053fa Mining sentience upgrade grants minebots a radio and ID 2018-02-11 05:13:47 -06:00
KorPhaeronandCitadelStationBot e64a42c248 Mining sentience upgrade grants minebots a radio and ID (#35235) 
* Minebots get mining radio+ID card

* Updates radio implant paths
 2018-02-11 05:13:46 -06:00
CitadelStationBot 9d88bae5cf Buildable Shuttle/Plastitanium Windows 2018-02-11 05:13:38 -06:00
uraniummeltdownandCitadelStationBot e3ec8a648a Buildable Shuttle/Plastitanium Windows (#35376) 
* use titanium/plastitanium on unanchored reinforced fulltile window to make shuttle/plastitanium windows

* updates titanium/plastitanium sprites, adds titanium glass and plastitanium glass, fixes material amount in mineral glass
 2018-02-11 05:13:37 -06:00
CitadelStationBot 775ff3bd4c Ruins now log to world only in TESTING mode 2018-02-11 05:13:19 -06:00
Jordan BrownandCitadelStationBot 26174bd317 Ruins now log to world only in TESTING mode (#35421) 
* Ruins now log to the game log instead of the runtime log

* Remove it entirely

* Use TESTING
 2018-02-11 05:13:18 -06:00
CitadelStationBot 61a830067d Buildable and upgradable All-In-One Grinder (again) 2018-02-11 05:12:26 -06:00
MokirosandCitadelStationBot cdcb5fc72f Buildable and upgradable All-In-One Grinder (#35451) 
Circuit is in "Biological Processing" techweb node
 2018-02-11 05:12:23 -06:00
CitadelStationBot c08e884199 Grabbers can now only contain things smaller than the assembly. 2018-02-11 05:08:42 -06:00
Dax DupontandCitadelStationBot 7992256bcb Grabbers can now only contain things smaller than the assembly. (#35462) 
* Grabbers can now only contain things smaller than the assembly

* Good suggestion buggy

* fucking github broke
 2018-02-11 05:08:41 -06:00
ShizCalevandCitadelStationBot f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
CitadelStationBotandGitHub 7f7bea7468 Merge pull request #5402 from Citadel-Station-13/upstream-merge-35473 
[MIRROR] Updates CONTRIBUTING.md for MapMerge2
 2018-02-11 01:23:28 -06:00
deathride58andGitHub 21be004afa Merge pull request #5406 from Citadel-Station-13/upstream-merge-35424 
[MIRROR] Replaces some var values with defines
 2018-02-11 02:24:48 +00:00
deathride58andGitHub a34dc0b90b Update personality.dm 2018-02-10 19:51:21 -05:00
CitadelStationBot 305e4f1d47 Automatic changelog generation for PR #5405 [ci skip] 2018-02-10 18:50:37 -06:00
deathride58andGitHub 33a4ef416b Merge pull request #5405 from Citadel-Station-13/upstream-merge-35493 
[MIRROR] Fixed cloning pod status not updating when autocloning.
 2018-02-11 00:50:35 +00:00
CitadelStationBot 88013a0bf2 Automatic changelog generation for PR #5404 [ci skip] 2018-02-10 18:50:17 -06:00
deathride58andGitHub 571ad489d4 Merge pull request #5404 from Citadel-Station-13/upstream-merge-35479 
[MIRROR] Fixed chemical recipe conflicts
 2018-02-11 00:50:15 +00:00
deathride58andGitHub d598695a3a Merge pull request #5403 from Citadel-Station-13/upstream-merge-35455 
[MIRROR] Removes runlevels spec from SSoverlays
 2018-02-11 00:50:03 +00:00
deathride58andGitHub 60cef5a8db Merge pull request #5401 from Citadel-Station-13/upstream-merge-35459 
[MIRROR] Fix a runtime if someone is deleted on the arrivals shuttle
 2018-02-11 00:49:36 +00:00
Jordan BrownandCitadelStationBot fd479e7128 Replaces some var values with defines 2018-02-10 11:11:09 -06:00
CitadelStationBot ed82270bf5 Fixed cloning pod status not updating when autocloning. 2018-02-10 11:09:52 -06:00
Jordan BrownandCitadelStationBot 3674d38a99 Merge pull request #35493 from DaxDupont/cloner 
Fixed cloning pod status not updating when autocloning.
 2018-02-10 11:09:52 -06:00