shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,893 Commits 5 Branches 0 Tags
e55716c8e44199df703f6923ae228f092cb2c7ff
Commit Graph
94 Commits
Author SHA1 Message Date
deathride58 f6a2966fca fixes merge conflicts 2017-12-04 18:24:04 -05:00
deathride58andGitHub 379f73d1e1 Merge branch 'master' into upstream-merge-32249 2017-12-04 23:15:38 +00:00
kevinz000andCitadelStationBot 66c66f0bd7 [READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on 2017-12-03 15:33:29 -06:00
LeoandCitadelStationBot f016daa833 Merge pull request #33179 from nicbn/removesmices 
Removes the mob mouse from maintenance from maps
 2017-12-02 09:44:39 -06:00
ACCountandCitadelStationBot f089b9ca2d Removes mass-spectrometers 2017-11-28 06:27:55 -06:00
deathride58andGitHub 470f4169df Merge pull request #4095 from Citadel-Station-13/upstream-merge-33018 
[MIRROR] Replaces "console screen" stock part with glass sheets
 2017-11-24 06:42:51 +00:00
ACCountandCitadelStationBot 2147c60b7f Replaces "console screen" stock part with glass sheets 2017-11-23 18:53:47 -06:00
deathride58 c81ebbfc24 fixes boxstation issues, readds removed boxstation areas 2017-11-22 22:18:40 -05:00
ShizCalevandCitadelStationBot 8a83b50113 Stacked turf cleanup (#32933) 2017-11-21 22:28:48 -06:00
deathride58 5d5d4451a9 fixes merge conflicts 2017-11-21 14:35:43 -05:00
ShizCalevandCitadelStationBot 2c65f5c6b5 Fixes dynamic lighting / nearstation area issues. 2017-11-21 08:41:54 -06:00
deathride58 e72399de7c pain 2017-11-21 00:29:15 -05:00
deathride58 0d11dfc6ef COMPILE, FOUL CREATURE 2017-11-20 23:39:23 -05:00
deathride58 d52e405912 hOPEFULLY FIXES THE GOD DAMN MERGE CONFLICTS 2017-11-20 23:12:58 -05:00
WJohnandCitadelStationBot e8ddae5d98 Cleans up floors.dmi a bit and adds new turf decals. 2017-11-20 20:48:06 -06:00
deathride58 fb62491701 manual map syncs + manual missed pr mirrors 2017-11-17 21:34:49 -05:00
Ashe HiggsandCitadelStationBot 9dff28b50d Improves the deep fryer 2017-11-13 03:16:11 -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
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 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
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
as334andCitadelStationBot eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05:00
ShizCalevandCitadelStationBot 6316c0d989 Fixes pipe runetime 2017-10-25 23:32:40 -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 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 930f6405b2 Map syncs 1 - initial commit, hard sync with TG 2017-10-23 12:47:38 -04:00
ShizCalevandCitadelStationBot df524ddaa6 Fixes mapping issues introduced in #30909 2017-10-17 13:36:08 -05:00
Jordan BrownandCitadelStationBot 742669cc62 Restores security bombsuit & white bombsuit 2017-10-15 11:33:42 -05:00
deathride58 5078783706 adds grilles outside of armory 2017-10-14 22:40:55 -04:00
deathride58 338c0a5696 gives hardsuit a wall to themselves (updating op with updated picture in like 5 seconds) 2017-10-14 22:38:22 -04:00
deathride58 fff2a6b767 makes sec lobby all access, adds extra shutters to courtroom 2017-10-14 22:27:01 -04:00
deathride58 1a04048978 fixes the regular wall tile amongst the reinforced tiles in boxstation cells 2017-10-14 22:04:58 -04:00
deathride58 cbad9c11c0 oof 2017-10-14 18:47:45 -04:00
deathride58 f7ff1c3f63 boxstation tweaks 2017-10-14 18:35:27 -04:00
LetterJayandGitHub dce56e3951 Merge pull request #3376 from Citadel-Station-13/upstream-merge-31598 
[MIRROR] Smoke Machine Updates & Fixes
 2017-10-14 10:21:09 -04:00
RobustinandCitadelStationBot 4100473aba Smoke Machine Updates & Fixes (#31598) 
* Smoke Machine Update

* Update smoke_machine.dm

* Compiling again
 2017-10-13 16:50:32 -05:00
Emmett GainesandCitadelStationBot 55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
LetterJayandGitHub f93733576e Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528 
[MIRROR] Minor refactor of how gas IDs are handled
 2017-10-12 07:19:30 -04:00
duncathan saltandCitadelStationBot c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
bawhoppenandCitadelStationBot 0e56051194 Moves Smoke Machine boards to tech storage (#31546) 2017-10-12 00:28:35 -05:00