shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,177 Commits 5 Branches 0 Tags
cff69db1c3a0f5f6705c195468fe29aa3ecc669c
Commit Graph

1223 Commits

Author SHA1 Message Date
Lin
cde6601c60 Merge pull request #10759 from Ghommie/Ghommie-cit534 
demodularize and removes lot of unused clothing with missing sprites.
 2020-01-29 19:58:26 +00:00
Ghom
2643fd053b Merge pull request #10748 from Trilbyspaceclone/door- 
correct door to vault being all access
 2020-01-29 01:59:42 +01:00
TrilbySpaceClone
a3ce2b06f6 tada 2020-01-28 16:09:49 -05:00
TrilbySpaceClone
92e355267f Revert "correct door to vault being all access" 
This reverts commit f145dd1730.
 2020-01-28 16:07:15 -05:00
Ghommie
e860110771 Ruskie battle hats in box maint, get some (their armor is fairly weak) 2020-01-28 03:55:30 +01:00
KathrinBailey
13d9509610 removes backup 2020-01-28 02:24:32 +00:00
KathrinBailey
bc7c28a62f removes improvements 
this is now solely bug fixes
 2020-01-28 02:22:56 +00:00
TrilbySpaceClone
f145dd1730 correct door to vault being all access 2020-01-27 02:31:19 -05:00
KathrinBailey
c4610fdff7 okay goodbye meta changes 2020-01-26 08:29:17 +00:00
KathrinBailey
c4e7f85b17 ignore this commit 
bruh I need the new meta
 2020-01-26 08:26:15 +00:00
KathrinBailey
0c186d235d Merge remote-tracking branch 'upstream/master' into Kat'sBoxRework 2020-01-26 08:21:54 +00:00
KathrinBailey
28fcbe444d map merge 2020-01-24 18:37:22 +00:00
KathrinBailey
8ff628343b box updates 
slight cargo jiggery
slight hop jiggery
stamps, stamps, stamps! (and paperwork)
Garden has botany vendors
 2020-01-24 18:35:06 +00:00
Ghommie
95a2479c6a Additional runtime fixes. 2020-01-24 04:59:56 +01:00
Ghom
047059617c Merge pull request #10645 from r4d6/Modular-Lavaland 
Modularize the mining base
 2020-01-23 02:53:34 +01:00
Ghom
4435bd4d56 Merge pull request #10622 from Owai-Seek/mojodojo 
Ghost Cafe Cleanup
 2020-01-23 02:41:18 +01:00
r4d6
e3cb379bde Add the Mining Base as a submap 2020-01-21 20:31:40 -05:00
KathrinBailey
b826926bf9 Merge remote-tracking branch 'upstream/master' into Kat'sBoxRework 2020-01-21 17:22:17 +00:00
Ghom
0985d1f1d0 Merge pull request #10640 from r4d6/mapfix 
Map Fixes
 2020-01-21 16:23:39 +01:00
r4d6
1ae106cca2 Fixes 2020-01-21 09:23:34 -05:00
Winter Flare
3828c60367 Update CentCom.dmm 
Towel Bins into Bedsheet Bins
 2020-01-20 02:07:33 -05:00
Winter Flare
710eaa7fc0 Lighting + Carpet Locker fixes. 2020-01-20 01:06:02 -05:00
Winter Flare
c8b5c6e3cd Ghost Cafe Beautification 
Added Vendors
Added Carpeting and Wood
Made Botany, Dorms, and Kitchen/Bar slightly larger.
Added Vendor Refills
Added a ton of Janitorial Stuff
Added a second set of showers.
Added more trashcans.
Added Ambrosia Gaia seeds.
Added Bedsheet + Towel Bins
Added one Slot Machine
Scattered around some Coins
 2020-01-20 00:22:24 -05:00
kevinz000
088e586b47 Merge pull request #9601 from Ghommie/Ghommie-cit265 
Ports move force and move resist, movement/pushing/pulling tweaks & co.
 2020-01-19 16:10:56 -07:00
Ghom
0a5e2cf8ff Merge pull request #10601 from Putnam3145/dojo-hilbert 
Adds 16777216 dorms to the ghost dojo
 2020-01-19 03:02:32 +01:00
Ghommie
3ee855ab77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 22:14:06 +01:00
Ghom
d709edb1c2 Merge pull request #10578 from r4d6/Mining 
Port TG's Mining changes
 2020-01-18 20:32:14 +01:00
Putnam
133cb89b32 hilbert's hotel for ghost dojo 2020-01-18 06:55:26 -08:00
Putnam
3788bc6676 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos 2020-01-17 21:33:13 -08:00
r4d6
4e114d399c Readding Cryo Sleeper in the gulag 2020-01-17 22:13:19 -05:00
KathrinBailey
c4be412564 Fixes bugs 
Changelog will be on PR
 2020-01-17 20:55:13 +00:00
r4d6
98bb9397ea fix cyborgs spawns 2020-01-16 21:05:51 -05:00
r4d6
1413990ea2 Fix another TG snowflake variable. 2020-01-16 16:15:54 -05:00
r4d6
79256fa698 Fix TG's snowflake on_station_override var 2020-01-16 15:50:01 -05:00
r4d6
a360a89f86 Map Changes 2020-01-16 15:10:57 -05:00
Ghommie
c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
kevinz000
c69d882943 Merge pull request #10521 from BlackMajor/master 
Fixes roundstart borg spawns, plus a little bit extra.
 2020-01-12 00:40:48 -08:00
Ghom
5dc598e2ea Merge pull request #10465 from Putnam3145/more-dojo-tweaks 
More ghost dojo tweaks
 2020-01-11 15:03:45 +01:00
Putnam
312da86424 Suggested changes 2020-01-11 01:28:49 -08:00
BlackMajor
30fc5b560b Couple of lingering fixes 2020-01-11 17:57:18 +13:00
r4d6
f11cc9bcee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into quick-fix 2020-01-10 00:09:24 -05:00
r4d6
48abd31dee Fix SM 5x5 2020-01-10 00:06:06 -05:00
Putnam
57530ab1c9 Added one to box, too 2020-01-09 19:36:44 -08:00
Ghommie
825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00
Putnam3145
b09ef97ae3 Merge pull request #10305 from BlackMajor/Yeehaw 
Various Mining borg changes. And some extras.
 2020-01-07 16:50:21 -08:00
BlackMajor
c4dd0a393a Revert "Test" 
This reverts commit 5414f09b80.
 2020-01-08 13:38:35 +13:00
BlackMajor
3424862746 Revert "Adds borg spawns to every map, and fixes a shit load of null vars on them." 
This reverts commit cfb553b828.
 2020-01-08 13:38:25 +13:00
BlackMajor
8aaa6db732 Revert "Test" 
This reverts commit 8746e6091d.
 2020-01-08 13:38:17 +13:00
BlackMajor
0520d3d9b9 Revert "Conflcits are pretty bothersome I tell ya hwat" 
This reverts commit e6f11aa275.
 2020-01-08 13:38:10 +13:00
BlackMajor
e6f11aa275 Conflcits are pretty bothersome I tell ya hwat 2020-01-08 13:20:24 +13:00