shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,247 Commits 5 Branches 0 Tags
7e42e7cce014e5453874187a3d208cb713ee4015
Commit Graph
471 Commits
Author SHA1 Message Date
deathride58andGitHub 11cf2365f7 Merge pull request #4033 from Citadel-Station-13/upstream-merge-32856 
[MIRROR] Various Meta area fixes
 2017-11-21 04:16:27 +00:00
deathride58andGitHub 441806c4e8 Merge pull request #4032 from Citadel-Station-13/upstream-merge-32846 
[MIRROR] Fixes unpowered air injectors on pubby
 2017-11-21 04:14:58 +00:00
deathride58 ac2324fde8 fixes merge conflicts 2017-11-20 22:50:19 -05:00
deathride58 48adeffc57 Fixes merge conflict 2017-11-20 22:47:08 -05:00
Jordan BrownandCitadelStationBot ff3b8ec67a Merge pull request #32915 from francinum/master 
Replaces the strangely sized buildshuttle plate
 2017-11-20 16:44:48 -06:00
ShizCalevandCitadelStationBot 32d9ea87f6 Various Meta area fixes 2017-11-20 02:43:09 -06:00
ShizCalevandCitadelStationBot dc2ecefe90 Fixes unpowered air injectors on pubby 2017-11-20 02:38:51 -06:00
deathride58andGitHub d8e1562fcf Merge pull request #3995 from deathride58/manualsyncsreeEEEE 
Manual map syncs + manual mirrors of missed upstream map PRs
 2017-11-20 05:12:06 +00:00
JordieandCitadelStationBot d843e75c3b Merge pull request #32888 from ShizCalev/animal-ruin-tanks 
Corrects animal ruin tank rotation
 2017-11-19 22:24:06 -06:00
deathride58 d0e7fde37b merges #4007 2017-11-19 02:46:18 -05:00
deathride58 fb62491701 manual map syncs + manual missed pr mirrors 2017-11-17 21:34:49 -05:00
LetterJayandGitHub 9849b9a13b Merge pull request #3912 from Citadel-Station-13/upstream-merge-32482 
[MIRROR] Improves the deep fryer
 2017-11-15 11:13:56 -06:00
orangesandCitadelStationBot 43113cd9b5 Merge pull request #31947 from AnturK/yarr 
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.

If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.

    There's an internal GPS onboard so crew will always be able to follow the shuttle.
    Crew of 3, moderately armed. (Balance pending)
    Shuttle engines have 3 minute cooldown between jumps.
    Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
 2017-11-13 03:19:38 -06:00
Ashe HiggsandCitadelStationBot 9dff28b50d Improves the deep fryer 2017-11-13 03:16:11 -06:00
Tad HardestyandCitadelStationBot 5f8d368d9f Fix bluespace shelters smoothing with non-shelter walls (#32526) 2017-11-09 11:07:15 -06:00
deathride58 2f21f16b53 initial commit - syncs and fiXES EVERYTHING WRONG ABOUT BOX HOLY FUCK HOW DID NOBODY REPORT ALL THIS SHIT 2017-11-08 17:04:20 -05:00
LetterJayandGitHub 3bae5fcef1 Merge pull request #3832 from Citadel-Station-13/upstream-merge-32427 
[MIRROR] Cleans up wire varedits
 2017-11-07 04:45:12 -06:00
ShizCalevandCitadelStationBot b89cedcb08 Cleans up wire varedits (#32427) 2017-11-05 17:36:31 -06:00
vuonojenmustaturskaandCitadelStationBot cc438ea9b4 Refactors and improvements to xenobio slime processor (#32406) 
* Do not let your memes be dreams

* static lists for great justice

* Local man forgets to capitalize a word

* Slime processor no longer runtimes when processing food
 2017-11-05 04:32:07 -06:00
LetterJayandGitHub 5113a71cff Merge pull request #3807 from Citadel-Station-13/upstream-merge-32403 
[MIRROR] Removes Freon preset gas filters from all maps
 2017-11-04 22:54:06 -05:00
LetterJayandGitHub f81f3b7262 Merge pull request #3805 from Citadel-Station-13/upstream-merge-32390 
[MIRROR] Fixes wrong locker IDs in pubby security cells
 2017-11-04 22:53:09 -05:00
LetterJayandGitHub 1aa42f1490 Merge pull request #3803 from Citadel-Station-13/upstream-merge-32391 
[MIRROR] Expands ancient station map areas.
 2017-11-04 22:51:56 -05:00
LetterJayandGitHub cd9bab3052 Merge pull request #3799 from deathride58/furtherboxedits 
Boxstation Edits: Legless Warden edition
 2017-11-04 22:50:58 -05:00
ACCountandCitadelStationBot b1b69d107b Removes Freon preset gas filters from all maps (#32403) 2017-11-04 14:24:35 -05:00
LeoandCitadelStationBot 3b69610dca Merge pull request #32390 from ShizCalev/pubby-locker-fix 
Fixes wrong locker IDs in pubby security cells
 2017-11-04 13:08:12 -05:00
WJohnandCitadelStationBot 1e32be17ec Expands ancient station map areas (#32391) 2017-11-04 11:20:21 -05:00
deathride58 43dcaed39e Blech 2017-11-04 01:18:23 -04:00
deathride58 961991f7e4 github for windows is an amazing git client 2017-11-04 00:56:31 -04:00
deathride58 1c38ebd9e4 tons of map changes to go around 2017-11-04 00:55:56 -04:00
ACCountandCitadelStationBot a3783943a7 Internal map improvements (#32310) 
* Internal map improvements

* More map sheet fixes

* PubbyStation fix

* More map fixes
 2017-11-02 01:23:30 -05:00
orangesandCitadelStationBot 771cce48ad Merge pull request #32182 from AutomaticFrenzy/patch/raven 
Fix improper diagonal corners on the Raven shuttle
 2017-10-31 15:13:52 -05:00
LetterJayandGitHub 3c08b5e4ca Merge pull request #3676 from Citadel-Station-13/upstream-merge-32189 
[MIRROR] Makes the atmos table accessible in MetaStation
 2017-10-29 23:37:44 -04:00
naltronixandCitadelStationBot 98a9c8933f fixes the table (#32189) 2017-10-29 10:57:34 -05:00
Jordan BrownandCitadelStationBot 27492e891f Map config cleanup (#32132) 
* Map config cleanup

* Fix
 2017-10-27 17:35:05 -05:00
as334andCitadelStationBot eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05:00
LetterJayandGitHub 02623b8e59 Merge pull request #3614 from Citadel-Station-13/upstream-merge-32057 
[MIRROR] Makes luxurious emergency shuttle noteleport
 2017-10-26 14:21:48 -04:00
LetterJayandGitHub 1df0bc16a4 Merge pull request #3608 from Citadel-Station-13/upstream-merge-32082 
[MIRROR] Fixes pipe runtime
 2017-10-26 14:21:07 -04:00
ShizCalevandCitadelStationBot dbba59e0b5 Makes luxurious emergency shuttle noteleport 2017-10-25 23:39:41 -05:00
ShizCalevandCitadelStationBot 6316c0d989 Fixes pipe runetime 2017-10-25 23:32:40 -05:00
LeoandCitadelStationBot 6235c66517 Merge pull request #32070 from ShizCalev/delta-vent 
Corrects disabled vent in delta toxins lab.
 2017-10-25 18:55:54 -05:00
deathride58 2fc3636360 FUCK part 3 - fixes gravity generator assmos and also makes nonlethal armory look less like ass while im at it 2017-10-23 18:12:26 -04:00
deathride58 0a3f908a7b FUCK - fixes brig wiring 2017-10-23 17:33:04 -04:00
deathride58 cfb6f98c3c FIXES RWALL YES THIS IS NECESSARY FUCK 2017-10-23 15:58:33 -04:00
deathride58 ec6b7770c9 merges #3577 2017-10-23 15:47:43 -04:00
deathride58 c77421ec4a EMERGENCY BOX CLOWN/MIME OFFICE HOTFIX 2017-10-23 15:36:51 -04:00
deathride58 6ead40bcee Boxstation security changes 2017-10-23 14:43:05 -04:00
deathride58 268c80dc66 fixes areas, other small changes 2017-10-23 14:26:05 -04:00
deathride58 c6150a0819 Boxstation major non-security map changes 2017-10-23 14:10:23 -04:00
deathride58 bc3e8968ab Deltastation + Metastation map changes 2017-10-23 13:41:57 -04:00
deathride58 930f6405b2 Map syncs 1 - initial commit, hard sync with TG 2017-10-23 12:47:38 -04:00