278a9cf9ae
Merge pull request #10966 from r4d6/mininge
...
Fix mining base having holes to space
2020-02-08 05:06:22 +01:00
f4c148d44f
Fix mining base having holes to space
2020-02-07 22:58:47 -05:00
3f5805a9e8
Merge pull request #10798 from necromanceranne/secmainsrejoice
...
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
2020-02-06 23:52:49 -07:00
cf99ad9671
Merge pull request #10901 from Trilbyspaceclone/more-box-fixes-and-tweaks
...
Corrects Box'es caps office + some other tweaks
2020-02-06 03:47:28 -07:00
205c38a7c5
edits 4-5 things, gets 40000 lines of code edits
2020-02-04 17:40:25 -05:00
8c25277913
Add files via upload
2020-02-04 12:17:28 -08:00
ab1730ad1f
Add files via upload
2020-02-04 11:38:36 -08:00
0779b67acc
whoops
2020-02-03 15:51:07 +11:00
07a4515b23
Thankfully I didn't fuck it up this way
2020-02-03 15:03:16 +11:00
ffa7590203
Status Displays should now actually work
2020-01-30 16:07:26 -06:00
f74475a6e0
Merge pull request #10749 from kevinz000/duke_moxley
...
It's high noon...
2020-01-30 00:19:37 +01:00
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
2643fd053b
Merge pull request #10748 from Trilbyspaceclone/door-
...
correct door to vault being all access
2020-01-29 01:59:42 +01:00
9dfcef68ed
Merge branch 'master' into duke_moxley
2020-01-28 17:53:08 -07:00
a3ce2b06f6
tada
2020-01-28 16:09:49 -05:00
92e355267f
Revert "correct door to vault being all access"
...
This reverts commit f145dd1730
2020-01-28 16:07:15 -05:00
e860110771
Ruskie battle hats in box maint, get some (their armor is fairly weak)
2020-01-28 03:55:30 +01:00
13d9509610
removes backup
2020-01-28 02:24:32 +00:00
bc7c28a62f
removes improvements
...
this is now solely bug fixes
2020-01-28 02:22:56 +00:00
fa2cc0cfdf
adds
2020-01-27 03:39:27 -07:00
f145dd1730
correct door to vault being all access
2020-01-27 02:31:19 -05:00
c4610fdff7
okay goodbye meta changes
2020-01-26 08:29:17 +00:00
c4e7f85b17
ignore this commit
...
bruh I need the new meta
2020-01-26 08:26:15 +00:00
0c186d235d
Merge remote-tracking branch 'upstream/master' into Kat'sBoxRework
2020-01-26 08:21:54 +00:00
28fcbe444d
map merge
2020-01-24 18:37:22 +00:00
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
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
b826926bf9
Merge remote-tracking branch 'upstream/master' into Kat'sBoxRework
2020-01-21 17:22:17 +00: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
0a5e2cf8ff
Merge pull request #10601 from Putnam3145/dojo-hilbert
...
Adds 16777216 dorms to the ghost dojo
2020-01-19 03:02:32 +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
c4be412564
Fixes bugs
...
Changelog will be on PR
2020-01-17 20:55:13 +00: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
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
312da86424
Suggested changes
2020-01-11 01:28:49 -08:00
30fc5b560b
Couple of lingering fixes
2020-01-11 17:57:18 +13:00
57530ab1c9
Added one to box, too
2020-01-09 19:36:44 -08:00
Ghom