shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,037 Commits 5 Branches 0 Tags
a96857a401f121dcea00652cc5dbe4773cccfd21
Commit Graph
1387 Commits
Author SHA1 Message Date
EmeraldSundisk a96857a401 Update CogStation.dmm 2020-03-26 08:54:08 -07:00
EmeraldSundisk 4f8e36ebd6 Update CogStation.dmm 2020-03-24 16:50:46 -07:00
EmeraldSundisk a000220157 Update CogStation.dmm 2020-03-23 12:46:39 -07:00
EmeraldSundisk 9337536897 Update CogStation.dmm 2020-03-22 22:05:16 -07:00
EmeraldSundisk 0a539949a0 Update CogStation.dmm 2020-03-22 10:19:13 -07:00
EmeraldSundiskandGitHub 624916ff18 Add files via upload 2020-03-21 20:09:34 -07:00
EmeraldSundisk b384982a92 Update CogStation.dmm 2020-03-21 17:12:17 -07:00
EmeraldSundisk bc6b217565 minimapfix 2020-03-19 15:27:54 -07:00
EmeraldSundisk 4f63b3dd09 Update CogStation.dmm 2020-03-18 16:59:38 -07:00
EmeraldSundisk 6855d2d9a4 Let's try this again. 2020-03-18 14:29:34 -07:00
EmeraldSundisk fc1416d237 Create FOLDER.txt 2020-03-18 14:18:35 -07:00
nik707andGitHub 9b71b1a9a2 Merge pull request #11511 from EmeraldSundisk/cogshuttles 
Let's just start with the shuttles.
 2020-03-18 14:37:27 -05:00
kevinz000andGitHub b113166c3e Merge pull request #11506 from zeroisthebiggay/kevinzdemandsthefix 
Big Box Brig Boogaloo (kevinzs requests and stuffs)
 2020-03-18 03:35:08 -07:00
EmeraldSundiskandGitHub 0df0910543 Add files via upload 2020-03-17 11:59:45 -07:00
EmeraldSundiskandGitHub 4391afa295 Add files via upload 2020-03-17 11:50:50 -07:00
kevinz000andGitHub 039c56f3a9 Merge pull request #11495 from BlackMajor/SpaceRuins 
Ash walker camp tweak because Ghommie asked me to.
 2020-03-17 09:29:05 -07:00
EmeraldSundisk 01d90f5cc8 shut 2020-03-17 08:37:24 -07:00
EmeraldSundisk dfe73565a1 Revert "shut" 
This reverts commit 7502cec756.
 2020-03-17 08:33:53 -07:00
EmeraldSundisk e3cbf88989 Revert "5" 
This reverts commit 17877d0d75.
 2020-03-17 08:33:32 -07:00
EmeraldSundisk 17877d0d75 5 2020-03-17 08:22:17 -07:00
EmeraldSundisk 7502cec756 shut 2020-03-17 08:19:45 -07:00
ZeroMan 4e6dd9eed0 and all comes tumbling 2020-03-16 15:06:29 -04:00
ZeroMan 2e866691e1 i hate my life 2020-03-16 15:05:35 -04:00
ZeroMan 29d1eaf81d and i wanna die 2020-03-16 14:36:20 -04:00
ZeroMan cf3812d222 and i wanna die 2020-03-16 14:35:36 -04:00
bunny232andGitHub faa5a93510 Fixed missing pipe by box vault (#11488) 
* Update BoxStation.dmm

* Update BoxStation.dmm
 2020-03-16 16:23:11 +01:00
BlackMajor 97b8d0ba27 small ash walker camp tweak 2020-03-16 19:51:47 +13:00
ZeroMan 8da4521a91 and i hate lawyers 2020-03-15 16:16:49 -04:00
ZeroMan 6968e94b06 and maybe it works 2020-03-15 12:58:33 -04:00
ZeroMan a1f4c0232e a i wanna die 2020-03-15 12:57:55 -04:00
ZeroMan 107a9fa2d2 and map merge exists 2020-03-15 11:29:49 -04:00
ZeroMan 82b63081f6 a couple more tweaks 2020-03-15 11:28:57 -04:00
ZeroMan edb63ed212 and torture my cocknballs 2020-03-15 01:50:40 -04:00
ZeroMan 74076eb351 and maybe thisll work 2020-03-15 01:23:23 -04:00
ZeroMan 99b189844e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into brigmedbayssaltpr 
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
 2020-03-15 01:11:19 -04:00
bunny232andGitHub 23e9ecf97c Update BoxStation.dmm (#11456) 2020-03-15 04:05:04 +01:00
ZeroMan d81247e15e and also map merge 2020-03-14 21:26:40 -04:00
ZeroMan ec93e194d2 oh yeah disposals exists 2020-03-14 21:25:57 -04:00
ZeroMan d5bd1c1f4c and map merge exists 2020-03-14 20:51:11 -04:00
ZeroMan 3f3def6715 i am gonna choom 2020-03-14 20:50:08 -04:00
ZeroMan e54011c7c3 day one updates simulator 2020-03-14 17:38:40 -04:00
ZeroMan 6a0b7ecdeb my ocd takes over 2020-03-14 17:29:17 -04:00
ZeroMan 1c92ef27b4 quite the quirky momentumeus 2020-03-14 17:21:00 -04:00
ZeroMan ea5fac9197 breathing is fine too 2020-03-14 16:56:33 -04:00
ZeroMan 8970cb433e i really hate life 2020-03-14 16:39:59 -04:00
ZeroMan 6b486a64f5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into brigmedbayssaltpr 
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
 2020-03-14 16:34:06 -04:00
ZeroMan b726f274a7 map merge exists too 2020-03-14 16:14:05 -04:00
ZeroMan 98c66d2fc9 and the finishing touches 2020-03-14 16:13:24 -04:00
ZeroMan 863d564d38 couple more bug fixes 2020-03-14 16:02:43 -04:00
ZeroMan 0d7237b3ec do them more workies 2020-03-14 15:29:02 -04:00