-
-
Notifications
You must be signed in to change notification settings - Fork 261
Von Neumann Class - a mid-pop solgov ship #2656
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Pockets-byte
wants to merge
224
commits into
BeeStation:master
Choose a base branch
from
Pockets-byte:Robot-Ship
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 16 commits
Commits
Show all changes
224 commits
Select commit
Hold shift + click to select a range
84733af
Added map
Pockets-byte 5dcc41b
tons of work on the map, and touching rad collectors to make singular…
Pockets-byte 33b8653
more work is done
Pockets-byte 0c6d54c
Update .gitignore
Pockets-byte 57d4db6
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte 3989b4f
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte 149f86b
more stuff
Pockets-byte 744b301
names and defunct roof removed
Pockets-byte b333425
work maybe?
Pockets-byte 6833c86
fixes space in walls
Pockets-byte e264a3a
more work
Pockets-byte 0d39c68
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte 6d4a156
fixes le stupid
Pockets-byte 887736b
AAAAaaaaaaaaaa
Pockets-byte ae25b56
Merge branch 'Robot-Ship' of https://github.com/Pockets-byte/NSV13 in…
Pockets-byte 571620b
moved the icon files
Pockets-byte 25090cd
Removes everything bad
Pockets-byte 715591f
bleh
Pockets-byte f5ca08c
stuff
Pockets-byte 86c7f6f
works ingame now
Pockets-byte ffe0e62
A lot of stuff
Pockets-byte 8735fa8
the shields are legal
Pockets-byte e885d0c
goodnight
Pockets-byte 1f01621
Merge branch 'Robot-Ship' of https://github.com/Pockets-byte/NSV13 in…
Pockets-byte 16d0406
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte e73d4ca
e.e
Pockets-byte 49980f8
Merge branch 'Robot-Ship' of https://github.com/Pockets-byte/NSV13 in…
Pockets-byte 77dd142
STOP CAPITALIZING MY JSONS
Pockets-byte 91e7846
No more capitalized jsons
Pockets-byte 4e1491f
Update vnmk3.dmm
Pockets-byte 1107eda
Update vnmk3.dmm
Pockets-byte b1ce981
Merge branch 'Robot-Ship' of https://github.com/Pockets-byte/NSV13 in…
Pockets-byte eab1a4b
Update vnmk3.dmm
Pockets-byte 778e1c9
wheeeeeeeeeeeeeeeeeeeeeeeeeeeeee
Pockets-byte 07d74de
Update vonneumann.json
Pockets-byte 65896ad
Update vnmk3.dmm
Pockets-byte b2b250b
one additional solgov AI ship, new sprite for the interdictor. more w…
Pockets-byte 239c10d
errors fixed yay
Pockets-byte f18575a
standarzisation
Pockets-byte cfbe41a
departments up to code
Pockets-byte b7822d4
getting much closer to done
Pockets-byte c26d76f
made some item descriptions make more sense.
Pockets-byte b1822de
most of everything else
Pockets-byte eda2788
oops. fixed wrong value in collector
Pockets-byte 7b3c7d0
removes sprite source files, fixes overlaps I forgot
Pockets-byte 5a88734
Merge branch 'Robot-Ship' of https://github.com/Pockets-byte/NSV13 in…
Pockets-byte 7ac50ca
missed one =(
Pockets-byte 22d7015
assuming this doesn't break everything, maybe this'll make the map co…
Pockets-byte d1ca021
Adds job restrictions, and some really bad ascii art
Pockets-byte ae6aa53
AAAAAAAaaaaaa
Pockets-byte dabd22a
more problemfixing
Pockets-byte 50d89eb
work
Pockets-byte 0b98978
AI nodes theoretically work
Pockets-byte 8819de6
flags, I think
Pockets-byte fd7d04b
overlap be gone
Pockets-byte 0f2a2f8
missing "
Pockets-byte 07e4a6a
blah
Pockets-byte b1262c6
forgot to do areas
Pockets-byte e1d045d
makes the ship a bit weaker, and the armor values match the wisp
Pockets-byte b936b9c
progress
Pockets-byte 6daccb9
Create vonneumann.dm
Pockets-byte b69dc3d
head hrut
Pockets-byte f012094
fixes atmos
Pockets-byte 6f7a12d
missing quotation marks =/
Pockets-byte 6895418
removes redundancy(mostly)
Pockets-byte d566b9e
wiring
Pockets-byte 1ede268
shutters yaaaay
Pockets-byte 0d3d6e1
access changes... maybe
Pockets-byte 61307c8
overlaps yay!
Pockets-byte da67ba3
theoretically everything else
Pockets-byte 36fd5be
= 0 no more
Pockets-byte b38c6cf
single period
Pockets-byte e238dc5
adds an exterior button to the hangar
Pockets-byte ab82b9b
more moving individual wires and pipes
Pockets-byte 25eea19
bleh
Pockets-byte d2abab2
vent
Pockets-byte 9c72210
Update vnmk3.dmm
Pockets-byte c9fb207
:x:
Pockets-byte cbb880a
flooooooors
Pockets-byte cfa962c
additional work
Pockets-byte faf2d1c
work's done for now
Pockets-byte 4c06fb0
TEG's dead for now
Pockets-byte fbfd937
pop limits arbitrarily changed
Pockets-byte b7a2081
actually gave the ai vnc lasers
Pockets-byte 9c3b603
lots of work
Pockets-byte c85eb84
Merge branch 'Robot-Ship' of https://github.com/Pockets-byte/NSV13 in…
Pockets-byte f0d4016
OVERLAP BEGONE
Pockets-byte de9f3ae
bleh
Pockets-byte 47812e6
wallmounted pain
Pockets-byte b4fdfb3
AAAAAAAAAAAA
Pockets-byte 7bc832b
forgot one last thing
Pockets-byte 8179c2f
pete
Pockets-byte d47bc3d
the ship gained weight
Pockets-byte dbd1102
forgot the wirenodes
Pockets-byte 067e0a5
area stuff
Pockets-byte 1774b7b
theoretically last of the pipes
Pockets-byte fbdd323
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte 4967f35
last one for a while
Pockets-byte ef2c5ec
Merge branch 'Robot-Ship' of https://github.com/Pockets-byte/NSV13 in…
Pockets-byte 8f061e2
"SSSSS"
Pockets-byte c71fbd4
I swear this is the last fix
Pockets-byte 1033025
late additions
Pockets-byte 5f57fe3
I forgot the "s on a button
Pockets-byte 04eede1
things I guess
Pockets-byte a0887c0
adds a playable solgov fighter, a fighter lasercannon, and maps them …
Pockets-byte 135979f
Revert "adds a playable solgov fighter, a fighter lasercannon, and ma…
Pockets-byte ab0bf27
fixing more standout issues and areas
Pockets-byte d8bfd8f
cleaning
Pockets-byte 7fe2aab
debugging
Pockets-byte c11b3b1
light switches mostly
Pockets-byte 1e16ae1
more polish
Pockets-byte ce4f79d
oxygen tanks
Pockets-byte 750ce93
description stuff
Pockets-byte fae4e13
description AAAAA
Pockets-byte 9024a96
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte c5edd93
Oops
Pockets-byte c0c70c7
pain. 90% pain and 10% fixing
Pockets-byte e82ce78
headache
Pockets-byte 3959204
cleanup and cramming a shuttle in somehow
Pockets-byte ca67b67
AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
Pockets-byte ff54321
cargo shuttle
Pockets-byte a448def
guidelines
Pockets-byte 4c2715a
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte 60d0c06
radiation shielding for the reactor, fixed airlocks. flavor warning, …
Pockets-byte ec6dfba
revamped science area
Pockets-byte 9286d7a
areas
Pockets-byte c8604b7
slight power rerouting
Pockets-byte 05fd47b
minor layering and a few other tweaks
Pockets-byte 70a7e40
cleanup
Pockets-byte 430bddc
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte 1ffac0b
fixes missing asteroid protection on a portion of starboard maints
Pockets-byte cb92414
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte fffb9a2
touchup
Pockets-byte 9a2740e
Removes shieldwall IDs
Pockets-byte 492f3ab
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte 2ce6692
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte ebdf61c
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte a67c253
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte 00666a7
minor changes. mostly just floor stuff.
Pockets-byte 44d6591
Apply suggestions from code review
Pockets-byte af839f5
Update vnmk3.dmm
Pockets-byte cc0e036
hindsight is 20/20
Pockets-byte acf638e
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte a6ab252
last reference
Pockets-byte c23557e
Merge branch 'Robot-Ship' of https://github.com/Pockets-byte/NSV13 in…
Pockets-byte a2cad88
ferry space
Pockets-byte ab552e6
fixes most other issues
Pockets-byte da00f78
request console hell
Pockets-byte 4a09838
fixes pixel_y = 0
Pockets-byte 12c9e8c
fixed cargo windoor access. etc
Pockets-byte 2ac2969
complete cargo redesign
Pockets-byte 39b3061
not sure what changed?
Pockets-byte 78705ec
no more spirited away starring cargo shuttle
Pockets-byte c10b842
forgot ammo for the hangar
Pockets-byte dc4ae74
fixes some weirdness from various changes
Pockets-byte e375ec0
fixes a number of door permissions
Pockets-byte 70fb909
hangar signs
Pockets-byte fbee1ca
I forgot already
Pockets-byte 3064bf4
moved the Chrimas tree
Pockets-byte 9048ad7
slightly tweaks the lore paeg to be a little more targeted
Pockets-byte 072a235
slight lore tweak
Pockets-byte 292ec20
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte 664848b
minor laser lore tweaks
Pockets-byte 3b9a951
Apply suggestions from code review
Pockets-byte 9fbe38a
nukes the description
Pockets-byte 521667f
shrinks the thirring drive
Pockets-byte bc48269
Minplayers
Pockets-byte b4ffeb1
fixes test issues
Pockets-byte f9df774
Merge branch 'Robot-Ship' of https://github.com/Pockets-byte/NSV13 in…
Pockets-byte 1b5f866
xenobio fix
Pockets-byte 6fd52e8
fuel in the tank
Pockets-byte bcae2de
massively expanded maint
Pockets-byte 839b76a
decreases min pop to 12 like other mid-pop ships
Pockets-byte 50dfdc2
reduces the laserspam
Pockets-byte d40d3ee
Merge branch 'Robot-Ship' of https://github.com/Pockets-byte/NSV13 in…
Pockets-byte ae25c60
mostly continuous maint now
Pockets-byte 2b31857
Stormdrive, a few marking fixes, and flags that aren't under walls an…
Pockets-byte 06e392d
desc
Pockets-byte dec73f6
Ooops
Pockets-byte 44bb8a2
work please
Pockets-byte 84fd012
banners
Pockets-byte 9dfa0a2
more mice food
Pockets-byte 8bfeaef
cleaned up wiring slightly
Pockets-byte 3b9570b
fixes some wiring oversights
Pockets-byte 930385a
fixes a little OOPS in tcoms
Pockets-byte 5b9a258
no beno
Pockets-byte ae6195e
agcnr return, gas miners gone
Pockets-byte 7850d8c
post firelock NSV
Pockets-byte 109fcc8
fixed a lot of my big screwups... I hope
Pockets-byte 7aaa5df
standard atmos layout
Pockets-byte 94d454d
pipes
Pockets-byte 8db896d
more fax machines. fixed cargo shuttle
Pockets-byte 36f5ba5
lore
Pockets-byte 19e3324
desc tweaks
Pockets-byte e639717
the cloner is REAL
Pockets-byte bfdc350
fixes robots, airlocks
Pockets-byte 8a77a42
atmos redesign
Pockets-byte 5f3f9ce
Update vnmk3.dmm
Pockets-byte 52bca22
removes mix valves
Pockets-byte 4d3ccbc
atmoso
Pockets-byte ea78268
fixes cargo shuttle, makes maze slightly better/worse
Pockets-byte 70dc1a6
might make ship slightly less dodgy
Pockets-byte 77f569e
the damage sprites work.
Pockets-byte 890446e
minor floor marking changes and no cargo shuttle tinyfans
Pockets-byte 2a35548
added smooth variant sprites for guidelines and the solgov roundel. u…
Pockets-byte a24f557
icon changed?
Pockets-byte d25026b
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte 9f3d33b
adds oxygen tanks to mining
Pockets-byte 6b2cb29
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte 41eeee1
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte d8e233d
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte 5c858b2
Merge remote-tracking branch 'upstream/master' into Robot-Ship
Pockets-byte 8ab3a98
clears marge conflicts
Pockets-byte 703151b
Dumb wiring mistakes fixed
Pockets-byte 314e58f
minor changes.
Pockets-byte ec17249
few dumb things that I fixed before it crashed
Pockets-byte 564f15a
more small mistakes
Pockets-byte e6f3920
few cable changes
Pockets-byte 2921d99
Merge remote-tracking branch 'upstream/master' into Robot-Ship
Pockets-byte 9ba9d71
few fixes
Pockets-byte 3e4a0a1
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte ba3e0ca
enlarges atmos tanks. fixes a few area fuckups.
Pockets-byte 6d191d0
some suggested fixes
Pockets-byte 79b06dc
camera camera camera camera
Pockets-byte File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -187,3 +187,4 @@ Temporary Items | |
# Common build tooling, C B T | ||
!/tools/build | ||
|
||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
#define FORCE_MAP "_maps/vonneumann.json" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
{ | ||
"map_name": "SGV Von Neumann Mark III", | ||
"map_link": "neumann", | ||
"map_path": "map_files/Von_Neumann", | ||
"map_file": ["VNmk3.dmm"], | ||
"traits": [{"Linkage": "Self"}], | ||
"space_ruin_levels": -1, | ||
"space_empty_levels": 0, | ||
"shuttles": { | ||
"cargo": "cargo_atlas", | ||
"ferry": "ferry_fancy"}, | ||
"mine_disable": 1, | ||
"ship_type": "/obj/structure/overmap/nanotrasen/solgov/vnc", | ||
"faction": "solgov", | ||
"starmap_path": "config/starmap/starmap.json", | ||
|
||
"map_description": "The Von Neumann Mark III is an Experimental Destroyer designed to mount untested technology, carry it into battle, and do so with speed and power. no two ships of the class are similar, and they undergo constant refits to mount new technology slated to be tested in the heat of battle, and often used by SolGov special forces as a light escort and transport. It's fairly common for these ships to spontaniously explode or go missing during their missions due to their questionable outfitting and extremely light armor. the hull structure itself is robust, but that provides little comfort to crew when Enemy fire is tearing through the hull. SolGov has recently started contracting Whiterapids Crews to man these ships instead of providing their own. this model is equipped with a hybrid load of weapons, and a large number of forcefield emitters, as well as a high tech singularity drive that the ship sits on top of.", | ||
"manufacturer": "[Redacted]", | ||
"mapper": "Truncated-Cake", | ||
"commission_date": "May 19, 2264", | ||
"strengths": ["Legal energy shields", "Energy weapons", "Compact and easy to repair", "High tech,low maintenance singularity engine", "Highly Manuverable", "Advanced technology", "Smallest ship to ever mount a Turing Drive" ], | ||
"weaknesses": ["Fragile", "Power-hungry", "Near Non-existent armor", "Higher crew requirements", "Extremely small" ], | ||
"equipment": [ | ||
"SolGov shield generator", | ||
"1 NT-ST049 'Sturm' coaxial railgun", | ||
Pockets-byte marked this conversation as resolved.
Show resolved
Hide resolved
|
||
"1 burst phaser MK2", | ||
"Triple Laser Anti Missile System", | ||
"Defunct Missile Array", | ||
"2 light fighters", | ||
"2 heavy fighters", | ||
Pockets-byte marked this conversation as resolved.
Show resolved
Hide resolved
|
||
"1 Experimental High Energy Singularity Drive", | ||
"1 Thermoelectric Energy Generator" | ||
] | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.