shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,942 Commits 5 Branches 0 Tags
cf2fb9748ea8ed97099ff18eca4d0db976b3ca4f
Commit Graph
111 Commits
Author SHA1 Message Date
coiaxandCitadelStationBot e7fd239238 [Metastation] Easel in Quiet Room moved to art storage (#33240) 
That easel awkwardly blocks access to the table in the corner, so I've
moved it to art storage, removing a photocopier from art storage to
allow it to fit.
 2017-12-05 03:22:56 -06:00
deathride58 f6a2966fca fixes merge conflicts 2017-12-04 18:24:04 -05: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
ACCountandCitadelStationBot f089b9ca2d Removes mass-spectrometers 2017-11-28 06:27:55 -06:00
ACCountandCitadelStationBot 2147c60b7f Replaces "console screen" stock part with glass sheets 2017-11-23 18:53:47 -06:00
deathride58 0ca050563f fixes merge conflicts 2017-11-22 23:43:03 -05:00
ShizCalevandCitadelStationBot 1b094a4374 Fixes deleted turfs 2017-11-22 22:01:05 -06:00
ShizCalevandCitadelStationBot 8a83b50113 Stacked turf cleanup (#32933) 2017-11-21 22:28:48 -06:00
deathride58andGitHub 5a331eedad Merge pull request #4055 from Citadel-Station-13/upstream-merge-32931 
[MIRROR] Fixes dynamic lighting / nearstation area issues.
 2017-11-21 21:23:46 +00:00
deathride58 05800235b5 fixes mapping errors introduced in #4049 2017-11-21 13:54:20 -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 019b57316d i want to die 2017-11-20 23:53:14 -05:00
deathride58 0d11dfc6ef COMPILE, FOUL CREATURE 2017-11-20 23:39:23 -05:00
deathride58 4e727ee576 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860 
# Conflicts:
#	_maps/map_files/MetaStation/MetaStation.dmm
 2017-11-20 23:34:46 -05:00
deathride58 d52e405912 hOPEFULLY FIXES THE GOD DAMN MERGE CONFLICTS 2017-11-20 23:12:58 -05:00
deathride58 ac2324fde8 fixes merge conflicts 2017-11-20 22:50:19 -05:00
WJohnandCitadelStationBot e8ddae5d98 Cleans up floors.dmi a bit and adds new turf decals. 2017-11-20 20:48:06 -06:00
ShizCalevandCitadelStationBot 32d9ea87f6 Various Meta area fixes 2017-11-20 02:43:09 -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
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
ACCountandCitadelStationBot b1b69d107b Removes Freon preset gas filters from all maps (#32403) 2017-11-04 14:24:35 -05: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
naltronixandCitadelStationBot 98a9c8933f fixes the table (#32189) 2017-10-29 10:57:34 -05:00
as334andCitadelStationBot eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05: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
ShizCalevandCitadelStationBot 592f6d89f2 Adds missing petbed on Meta 2017-10-18 11:54:56 -05:00
ShizCalevandCitadelStationBot df524ddaa6 Fixes mapping issues introduced in #30909 2017-10-17 13:36:08 -05:00
kevinz000andCitadelStationBot 89fbf077d9 Fixes missing semicolon in sargeant araneus vars (#31790) 
* semicolon

* no define
 2017-10-16 22:55:31 -05:00
LetterJayandGitHub 24631746d4 Merge pull request #3414 from Citadel-Station-13/upstream-merge-31707 
[MIRROR] Restores security bombsuit & white bombsuit
 2017-10-16 14:12:28 -04:00
kevinz000andCitadelStationBot af5dab8436 fixE (#31740) 2017-10-15 20:56:34 -05:00
Jordan BrownandCitadelStationBot 742669cc62 Restores security bombsuit & white bombsuit 2017-10-15 11:33:42 -05:00
deathride58 f7194ab920 deltastation and metastation tweaks 2017-10-14 18:31:38 -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
LetterJayandGitHub 5e99ad27e5 Merge pull request #3287 from Citadel-Station-13/upstream-merge-30920 
[MIRROR] Adds the Chemistry Smoke Machine
 2017-10-10 22:31:27 -04:00
RobustinandCitadelStationBot a570ec8610 Adds the Chemistry Smoke Machine (#30920) 
* Smoke Machine

* Tweak

* More responsive smoke timing

* Antur Review and Admin Logs

* Cboss review

* More logging

* Removes analyze, streamlines logs

* r-e-a

* no s in reagents_list

* Cyberboss Review

* woops

* Cboss nitpicking
 2017-10-10 13:13:38 -05:00
LeoandCitadelStationBot 8101c5776a Merge pull request #31484 from Bawhoppen/berniesanders 
Removes portable chem dispenser from xenobio
 2017-10-10 07:09:21 -05:00
deathride58 5bd04f70d8 Readds kinkmates to delta and meta 2017-10-09 21:59:59 -04:00
LetterJay 8269450398 MapSync with /tg/ 2017-10-08 22:46:45 -05:00
deathride58andkevinz000 280b5f5e6f Adds kinkmates to Metastation and Deltastation (+Box tweaks) (#3214) 
* adds kinkmates to deltastation

* added kinkmates to metastation

* hides atmos pipes in maint dorms
 2017-10-07 22:52:43 -07:00
Jordan BrownandCitadelStationBot c6aec36f67 Merge pull request #31151 from Bawhoppen/122123 
Removes random junk from Metastation evidence closets
 2017-10-01 09:27:55 -05:00