cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-22 12:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
418 Commits
Author SHA1 Message Date
Enric Gabriel d210e46705 there 2020-08-23 21:19:11 -03:00
Enric Gabriel 8e2774bf0a try to fix broken box 2020-08-22 20:41:17 -03:00
Enric Gabriel f759503b49 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-22 20:30:49 -03: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
SandPootandGitHub 518c70e6ed Some Cit reverts and skyrat features. (#46) 2020-08-15 13:29:50 -03:00
SandPootandGitHub fe8119c18c Code optimizations + clean-up (#45) 2020-08-14 02:01:54 -03:00
Enric Gabriel cea68c05f5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-12 13:37:19 -03:00
siliconsandGitHub 130c3a9480 Merge pull request #13096 from Michiyamenotehifunana/possum 
Ports Opossums from Desert Rose
 2020-08-11 16:19:42 -07:00
Enric Gabriel 7929924d4a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-11 13:04:34 -03: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
Enric Gabriel bae8c236f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-09 18:34:33 -03: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
Enric Gabriel 11bb5191bf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-08 01:59:26 -03: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
Enric Gabriel 656dbe6d06 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-02 17:41:21 -03: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
Enric Gabriel 3bf338087d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-07-31 17:11:36 -03: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
Enric Gabriel f0904c6b10 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-21 01:19:25 -03: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
Enric GabrielandGitHub 6859279d3e CentCom Teleporters! (#25) 2020-07-20 01:20:49 -03:00
crazyraio2 59679ecbf4 More lamps for the pool, yay 2020-07-19 21:49:08 -03:00
Enric Gabriel 05593f84a0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-16 22:13:13 -03:00
crazyraio2 f28a5e8524 after four months 2020-07-15 13:17:32 -03:00
crazyraio2 232c39d1e4 stuff 2020-07-11 19:17:03 -03: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