95a2479c6a
Additional runtime fixes.
2020-01-24 04:59:56 +01:00
047059617c
Merge pull request #10645 from r4d6/Modular-Lavaland
...
Modularize the mining base
2020-01-23 02:53:34 +01:00
4435bd4d56
Merge pull request #10622 from Owai-Seek/mojodojo
...
Ghost Cafe Cleanup
2020-01-23 02:41:18 +01:00
e3cb379bde
Add the Mining Base as a submap
2020-01-21 20:31:40 -05:00
0985d1f1d0
Merge pull request #10640 from r4d6/mapfix
...
Map Fixes
2020-01-21 16:23:39 +01:00
1ae106cca2
Fixes
2020-01-21 09:23:34 -05:00
3828c60367
Update CentCom.dmm
...
Towel Bins into Bedsheet Bins
2020-01-20 02:07:33 -05:00
710eaa7fc0
Lighting + Carpet Locker fixes.
2020-01-20 01:06:02 -05:00
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
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
0a5e2cf8ff
Merge pull request #10601 from Putnam3145/dojo-hilbert
...
Adds 16777216 dorms to the ghost dojo
2020-01-19 03:02:32 +01:00
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
d709edb1c2
Merge pull request #10578 from r4d6/Mining
...
Port TG's Mining changes
2020-01-18 20:32:14 +01:00
133cb89b32
hilbert's hotel for ghost dojo
2020-01-18 06:55:26 -08:00
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
4e114d399c
Readding Cryo Sleeper in the gulag
2020-01-17 22:13:19 -05:00
98bb9397ea
fix cyborgs spawns
2020-01-16 21:05:51 -05:00
1413990ea2
Fix another TG snowflake variable.
2020-01-16 16:15:54 -05:00
79256fa698
Fix TG's snowflake on_station_override var
2020-01-16 15:50:01 -05:00
a360a89f86
Map Changes
2020-01-16 15:10:57 -05:00
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
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
5dc598e2ea
Merge pull request #10465 from Putnam3145/more-dojo-tweaks
...
More ghost dojo tweaks
2020-01-11 15:03:45 +01:00
312da86424
Suggested changes
2020-01-11 01:28:49 -08:00
30fc5b560b
Couple of lingering fixes
2020-01-11 17:57:18 +13:00
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
48abd31dee
Fix SM 5x5
2020-01-10 00:06:06 -05:00
57530ab1c9
Added one to box, too
2020-01-09 19:36:44 -08:00
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
b09ef97ae3
Merge pull request #10305 from BlackMajor/Yeehaw
...
Various Mining borg changes. And some extras.
2020-01-07 16:50:21 -08:00
c4dd0a393a
Revert "Test"
...
This reverts commit 5414f09b80
2020-01-08 13:38:35 +13:00
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
8aaa6db732
Revert "Test"
...
This reverts commit 8746e6091d
2020-01-08 13:38:17 +13:00
0520d3d9b9
Revert "Conflcits are pretty bothersome I tell ya hwat"
...
This reverts commit e6f11aa275
2020-01-08 13:38:10 +13:00
e6f11aa275
Conflcits are pretty bothersome I tell ya hwat
2020-01-08 13:20:24 +13:00
7ddc356a6f
Revert "Test 2"
...
This reverts commit 6670de8e64
2020-01-08 13:19:33 +13:00
6670de8e64
Test 2
2020-01-08 13:19:07 +13:00
8746e6091d
Test
2020-01-08 13:17:49 +13:00
cfb553b828
Adds borg spawns to every map, and fixes a shit load of null vars on them.
2020-01-08 12:37:31 +13:00
5414f09b80
Test
2020-01-08 12:29:45 +13:00
05a644cc41
Revert "Merge branch 'master' into Yeehaw"
...
This reverts commit 972c03f79f8ebd698763
2020-01-08 12:26:45 +13:00
972c03f79f
Merge branch 'master' into Yeehaw
2020-01-08 12:25:50 +13:00
b41c9cd844
Sync with master
2020-01-08 12:25:22 +13:00
9750eb3d42
"quotation marks"
2020-01-06 23:52:07 -08:00
b5026256db
aaand a few more
2020-01-06 23:42:27 -08:00
6f6f0cbb62
Tweaks to ghost dojo
2020-01-06 23:33:29 -08:00
3b6cf8c952
Merge pull request #10401 from r4d6/SM
...
Add three more Supermatter Engine variation for Box
2020-01-05 23:08:49 -08:00
e18244671f
Merge pull request #10350 from Putnam3145/dojo-ghostrole
...
Ghost cafe quality-of-life, plus making ghost role eligibility an element
2020-01-05 23:05:13 +01:00
592422ee70
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2020-01-05 22:53:00 +01:00
db13f748aa
Merge pull request #10317 from Trilbyspaceclone/map_redo
...
Corrects issues with box map
2020-01-05 16:24:46 +01:00
Ghommie