 Ghom
|
278a9cf9ae
|
Merge pull request #10966 from r4d6/mininge
Fix mining base having holes to space
|
2020-02-08 05:06:22 +01:00 |
|
|
r4d6
|
f4c148d44f
|
Fix mining base having holes to space
|
2020-02-07 22:58:47 -05:00 |
|
|
kevinz000
|
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 |
|
|
kevinz000
|
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 |
|
|
kevinz000
|
b17b98ff5f
|
Merge pull request #10907 from Citadel-Station-13/Ghommie-patch-2
Fixes no-grav lavaland labor/mining shuttle areas.
|
2020-02-05 23:43:21 -07:00 |
|
|
Ghom
|
c4e7f2f8cd
|
Merge pull request #10898 from EmeraldSundisk/smalltime
Disposing of a problem on Delta.
|
2020-02-05 20:47:54 +01:00 |
|
|
Ghom
|
20a5f905bc
|
Merge pull request #10832 from r4d6/shitters
Mining Update : Real update
|
2020-02-05 07:20:02 +01:00 |
|
|
Ghom
|
aaa58ef1e8
|
Update Mining_Station_Public_01.dmm
|
2020-02-05 05:13:36 +01:00 |
|
|
r4d6
|
f42ef66846
|
Move the lockers and the beacon
|
2020-02-04 19:25:10 -05:00 |
|
|
r4d6
|
60163330f7
|
closets
|
2020-02-04 19:07:01 -05:00 |
|
|
r4d6
|
32f3eec050
|
Real
|
2020-02-04 19:03:45 -05:00 |
|
|
TrilbySpaceClone
|
205c38a7c5
|
edits 4-5 things, gets 40000 lines of code edits
|
2020-02-04 17:40:25 -05:00 |
|
|
EmeraldSundisk
|
8c25277913
|
Add files via upload
|
2020-02-04 12:17:28 -08:00 |
|
|
EmeraldSundisk
|
ab1730ad1f
|
Add files via upload
|
2020-02-04 11:38:36 -08:00 |
|
|
necromanceranne
|
0779b67acc
|
whoops
|
2020-02-03 15:51:07 +11:00 |
|
|
necromanceranne
|
07a4515b23
|
Thankfully I didn't fuck it up this way
|
2020-02-03 15:03:16 +11:00 |
|
|
kevinz000
|
3fc832fbe7
|
Merge pull request #10819 from Ghommie/Ghommie-cit541
clown ops infiltrator consistency.
|
2020-02-02 01:39:08 -07:00 |
|
|
Ghom
|
2bb0a0311a
|
Merge pull request #10796 from Tupinambis/StatusBugFix
Status Display Fix: It's About Time
|
2020-02-02 01:51:07 +01:00 |
|
|
Ghom
|
d19b7a7695
|
Merge pull request #10744 from r4d6/Moar-Engines
Moar engines!
|
2020-02-01 19:11:10 +01:00 |
|
|
r4d6
|
f9ccca9c8f
|
Anti-Shitter mining update
|
2020-02-01 00:08:01 -05:00 |
|
|
Ghom
|
37c4565160
|
Whops. Two beacons, not one.
|
2020-02-01 02:06:56 +01:00 |
|
|
Ghommie
|
ab4aa29576
|
clown ops infiltrator consistency.
|
2020-02-01 00:02:31 +01:00 |
|
|
Tupinambis
|
ffa7590203
|
Status Displays should now actually work
|
2020-01-30 16:07:26 -06:00 |
|
|
Ghom
|
f74475a6e0
|
Merge pull request #10749 from kevinz000/duke_moxley
It's high noon...
|
2020-01-30 00:19:37 +01:00 |
|
|
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 |
|
|
kevinz000
|
9dfcef68ed
|
Merge branch 'master' into duke_moxley
|
2020-01-28 17:53:08 -07: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 |
|
|
kevinz000
|
fa2cc0cfdf
|
adds
|
2020-01-27 03:39:27 -07:00 |
|
|
TrilbySpaceClone
|
f145dd1730
|
correct door to vault being all access
|
2020-01-27 02:31:19 -05:00 |
|
|
r4d6
|
4bcf2a60c3
|
missing pipe
|
2020-01-26 21:57:54 -05:00 |
|
|
r4d6
|
968e4a91b7
|
Two manifolds were invisible
|
2020-01-26 21:57:10 -05:00 |
|
|
r4d6
|
4884165d4f
|
Add TEG, Code & config
|
2020-01-26 20:58:16 -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 |
|
|
r4d6
|
5ef47ce60d
|
Budget engine
|
2020-01-25 21:36:19 -05:00 |
|
|
r4d6
|
e5d33e766e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Moar-Engines
|
2020-01-25 20:18:34 -05:00 |
|
|
r4d6
|
0896d124dc
|
Add stuff
|
2020-01-25 20:18:29 -05: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 |
|