shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,191 Commits 5 Branches 0 Tags
38e60025cf2a112baef11d725acb287cacdc82b1
Commit Graph
413 Commits
Author SHA1 Message Date
zeroisthebiggayandGitHub 44eb62b388 a (#13647) 2020-11-01 22:00:20 +01:00
siliconsandGitHub 453d5081a7 Merge pull request #13628 from MrJWhit/messing-with-boxstations-maint 
Adjusting Boxstation's Southeast Maint (three new rooms)
 2020-10-28 07:54:04 -07:00
MrJWhit 5806ea8f50 Even cooler.jpg 2020-10-26 20:39:20 -04:00
MrJWhit 5da37ddeb2 Minor fix 2020-10-26 18:57:06 -04:00
MrJWhit 65f82daa44 Update BoxStation.dmm 2020-10-25 17:59:53 -04:00
MrJWhit 1e65afda9d Update BoxStation.dmm 2020-10-25 17:58:00 -04:00
MrJWhit c540bcd0f2 Secret botany 2020-10-25 17:54:02 -04:00
MrJWhit 33cfcc72be Making box maint cooler, bot party room and maint rage cage part 1 2020-10-25 14:31:43 -04:00
Ghommie f49f72338f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841 2020-10-25 15:01:57 +01:00
Ghommie 90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
MrJWhitandGitHub c860cc78df Giving science a space loop on every map (#13611) 
* Boxstation Fix

* DeltaStation and Boxstation Update

* Kilo fix and minor omegastation fix

* Lambda fixing

* Metastation update

* Second to last update

* Pubby and final touches
 2020-10-25 14:15:01 +01:00
Detective Google c4480afc09 Adds a bunch of RP clothes and ports the detvendor 2020-09-30 20:50:00 -05:00
MrJWhit ff54b29e72 Haha terfs 2020-08-20 20:19:51 -04:00
MrJWhit 63e17875ac Boxstation expand 2020-08-19 21:46:28 -04:00
siliconsandGitHub 130c3a9480 Merge pull request #13096 from Michiyamenotehifunana/possum 
Ports Opossums from Desert Rose
 2020-08-11 16:19:42 -07:00
Detective Google 8976bea9a4 someone doesnt know how to fucking map edit 2020-08-11 10:35:52 -05:00
siliconsandGitHub c18b26efe9 Merge pull request #13071 from ancientpower/box-medbay-doors 
Adds doors to the west of box medbay
 2020-08-11 01:45:23 -07:00
Michiyamenotehifunana b33fc8e3b3 Adds Opposums to all maps 
Except cogstation because it throws an error
 2020-08-09 16:47:17 +08:00
Putnam 11560a0d69 Removed aphro from maps, too. 2020-08-08 01:38:11 -07:00
ancientpower 5f86cc8879 adds doors to the west of box medbay 2020-08-07 18:46:12 -05:00
MrJWhit 94acbb5fe8 Update BoxStation.dmm 2020-08-06 13:31:16 -04:00
dapnee bcffff1e7d Update BoxStation.dmm 
fucking amazing
 2020-07-31 16:02:58 -06:00
dapnee e197cb44b2 You Thought I Was Done Fucking With Box BUT YOU WERE WRONG! 
Fixed active turfs from plating that sat in space, removed random catwalk to nowhere, turned the medical console in the sleeper room to not face a window, FIXED MAINTENANCE BAR APC NOT ACTUALLY BEING FOR THE MAINTENANCE BAR. As well as fixed the xeno hive ruin on lavaland from having active turfs.
 2020-07-31 15:37:40 -06:00
dapnee 3fdd1654ad aaaaaaa 
I missed a SINGLE SINK
 2020-07-30 16:44:24 -06:00
dapnee f53280c9b7 adds another atmos tech spawn 
treading on justin's pr by accident, oops
 2020-07-28 13:46:10 -06:00
dapnee 170afed3bc oops 
forgot the sinks in the locker room
 2020-07-28 12:16:31 -06:00
dapnee 1540d66e88 Minor Fixes to Box 
backwards sinks and such
 2020-07-28 12:00:35 -06:00
siliconsandGitHub 267186a5d3 Merge pull request #12646 from Chiirno/emi 
[READY] Alt-click cigarette pack functionality added to pill bottles.
 2020-07-20 16:15:38 -07:00
Cirno bd289d0edb more map changes... 2020-07-05 00:08:33 -03:00
Artur 6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Ghommie de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Artur 882c11e0e5 This is every single onstation gateway r-r-ight? 2020-06-16 20:53:56 +03:00
Artur bc30fb7710 Hard resets _maps to master 2020-06-16 16:09:05 +03:00
Artur ceba739231 Cooonflicts 2020-06-16 01:23:42 +03:00
TrilbyspacecloneandGitHub f42994c79b Toxin tweaks! Just storage (#12363) 
* Toxin tweaks

* bepis readd

* paintings

* Update DeltaStation2.dmm

* Fixed
 2020-06-09 05:34:22 -07:00
Artur 094a1b6f62 More vr sleeper work and map fix 2020-06-09 11:06:16 +03:00
Artur 19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00
Ghommie 1bca74465f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 03:29:02 +02:00
GhomandGitHub 0a6b755eff Apotechary chem dispenser nerf. (#12292) 
* Apotechary chem dispenser nerf.

* Spelling and build_path.
 2020-05-24 13:20:32 -07:00
GhomandGitHub 293e3fea28 Removing that maint dorm carbin beside the disposal room, and excess wardrobe. (#12308) 2020-05-24 13:12:18 -07:00
GhomandGitHub 6756b564b7 Removing that one keg. (#12333) 2020-05-24 13:07:53 -07:00
GhomandGitHub ab5d65a454 Porting the BEPIS research machinery. (#12277) 
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
 2020-05-24 13:05:15 -07:00
Artur 9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
Ghommie 30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
jjpark-kbandGitHub cbc208375d [Map Fix] Button and Wall (#12285) 2020-05-16 22:29:43 +02:00
Ghommie fc5d5fb087 Moving buttons away from windows. 2020-05-14 00:23:47 +02:00
jjpark-kbandGitHub 1e0f30a446 [Map Edits] Minimal Piping/Device Fixes (#12239) 
* map fixes

* reverting delta fix for PR conflict
 2020-05-13 20:56:56 +02:00
Artur dabdf16eac Coonflict fiiixeeess 2020-05-13 12:56:17 +03:00
Artur 5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
kevinz000andGitHub 5a905b2f02 Fixes boxstation (#12236) 
* revert

* ok
 2020-05-13 03:15:17 +02:00