Skip to content
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

Von Neumann Class - a mid-pop solgov ship #2656

Open
wants to merge 154 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 145 commits
Commits
Show all changes
154 commits
Select commit Hold shift + click to select a range
84733af
Added map
Pockets-byte Mar 24, 2024
5dcc41b
tons of work on the map, and touching rad collectors to make singular…
Pockets-byte Apr 7, 2024
33b8653
more work is done
Pockets-byte May 6, 2024
0c6d54c
Update .gitignore
Pockets-byte May 6, 2024
57d4db6
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte May 6, 2024
3989b4f
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte May 14, 2024
149f86b
more stuff
Pockets-byte May 20, 2024
744b301
names and defunct roof removed
Pockets-byte May 20, 2024
b333425
work maybe?
Pockets-byte May 20, 2024
6833c86
fixes space in walls
Pockets-byte May 20, 2024
e264a3a
more work
Pockets-byte May 20, 2024
0d39c68
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte May 20, 2024
6d4a156
fixes le stupid
Pockets-byte May 20, 2024
887736b
AAAAaaaaaaaaaa
Pockets-byte May 20, 2024
ae25b56
Merge branch 'Robot-Ship' of https://github.com/Pockets-byte/NSV13 in…
Pockets-byte May 20, 2024
571620b
moved the icon files
Pockets-byte May 20, 2024
25090cd
Removes everything bad
Pockets-byte May 20, 2024
715591f
bleh
Pockets-byte May 20, 2024
f5ca08c
stuff
Pockets-byte May 20, 2024
86c7f6f
works ingame now
Pockets-byte May 21, 2024
ffe0e62
A lot of stuff
Pockets-byte May 21, 2024
8735fa8
the shields are legal
Pockets-byte May 21, 2024
e885d0c
goodnight
Pockets-byte May 21, 2024
1f01621
Merge branch 'Robot-Ship' of https://github.com/Pockets-byte/NSV13 in…
Pockets-byte May 21, 2024
16d0406
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte May 21, 2024
e73d4ca
e.e
Pockets-byte May 22, 2024
49980f8
Merge branch 'Robot-Ship' of https://github.com/Pockets-byte/NSV13 in…
Pockets-byte May 22, 2024
77dd142
STOP CAPITALIZING MY JSONS
Pockets-byte May 22, 2024
91e7846
No more capitalized jsons
Pockets-byte May 22, 2024
4e1491f
Update vnmk3.dmm
Pockets-byte May 22, 2024
1107eda
Update vnmk3.dmm
Pockets-byte May 22, 2024
b1ce981
Merge branch 'Robot-Ship' of https://github.com/Pockets-byte/NSV13 in…
Pockets-byte May 22, 2024
eab1a4b
Update vnmk3.dmm
Pockets-byte May 22, 2024
778e1c9
wheeeeeeeeeeeeeeeeeeeeeeeeeeeeee
Pockets-byte May 22, 2024
07d74de
Update vonneumann.json
Pockets-byte May 22, 2024
65896ad
Update vnmk3.dmm
Pockets-byte May 22, 2024
b2b250b
one additional solgov AI ship, new sprite for the interdictor. more w…
Pockets-byte May 22, 2024
239c10d
errors fixed yay
Pockets-byte May 22, 2024
f18575a
standarzisation
Pockets-byte May 22, 2024
cfbe41a
departments up to code
Pockets-byte May 23, 2024
b7822d4
getting much closer to done
Pockets-byte May 23, 2024
c26d76f
made some item descriptions make more sense.
Pockets-byte May 23, 2024
b1822de
most of everything else
Pockets-byte May 23, 2024
eda2788
oops. fixed wrong value in collector
Pockets-byte May 23, 2024
7b3c7d0
removes sprite source files, fixes overlaps I forgot
Pockets-byte May 23, 2024
5a88734
Merge branch 'Robot-Ship' of https://github.com/Pockets-byte/NSV13 in…
Pockets-byte May 23, 2024
7ac50ca
missed one =(
Pockets-byte May 23, 2024
22d7015
assuming this doesn't break everything, maybe this'll make the map co…
Pockets-byte May 23, 2024
d1ca021
Adds job restrictions, and some really bad ascii art
Pockets-byte May 23, 2024
ae6aa53
AAAAAAAaaaaaa
Pockets-byte May 23, 2024
dabd22a
more problemfixing
Pockets-byte May 23, 2024
50d89eb
work
Pockets-byte May 23, 2024
0b98978
AI nodes theoretically work
Pockets-byte May 23, 2024
8819de6
flags, I think
Pockets-byte May 23, 2024
fd7d04b
overlap be gone
Pockets-byte May 23, 2024
0f2a2f8
missing "
Pockets-byte May 24, 2024
07e4a6a
blah
Pockets-byte May 24, 2024
b1262c6
forgot to do areas
Pockets-byte May 24, 2024
e1d045d
makes the ship a bit weaker, and the armor values match the wisp
Pockets-byte May 25, 2024
b936b9c
progress
Pockets-byte May 26, 2024
6daccb9
Create vonneumann.dm
Pockets-byte May 26, 2024
b69dc3d
head hrut
Pockets-byte May 26, 2024
f012094
fixes atmos
Pockets-byte May 27, 2024
6f7a12d
missing quotation marks =/
Pockets-byte May 27, 2024
6895418
removes redundancy(mostly)
Pockets-byte May 27, 2024
d566b9e
wiring
Pockets-byte May 27, 2024
1ede268
shutters yaaaay
Pockets-byte May 27, 2024
0d3d6e1
access changes... maybe
Pockets-byte May 27, 2024
61307c8
overlaps yay!
Pockets-byte May 27, 2024
da67ba3
theoretically everything else
Pockets-byte May 27, 2024
36fd5be
= 0 no more
Pockets-byte May 27, 2024
b38c6cf
single period
Pockets-byte May 27, 2024
e238dc5
adds an exterior button to the hangar
Pockets-byte May 27, 2024
ab82b9b
more moving individual wires and pipes
Pockets-byte May 28, 2024
25eea19
bleh
Pockets-byte May 28, 2024
d2abab2
vent
Pockets-byte May 28, 2024
9c72210
Update vnmk3.dmm
Pockets-byte May 28, 2024
c9fb207
:x:
Pockets-byte May 29, 2024
cbb880a
flooooooors
Pockets-byte May 29, 2024
cfa962c
additional work
Pockets-byte May 30, 2024
faf2d1c
work's done for now
Pockets-byte May 30, 2024
4c06fb0
TEG's dead for now
Pockets-byte May 31, 2024
fbfd937
pop limits arbitrarily changed
Pockets-byte May 31, 2024
b7a2081
actually gave the ai vnc lasers
Pockets-byte May 31, 2024
9c3b603
lots of work
Pockets-byte May 31, 2024
c85eb84
Merge branch 'Robot-Ship' of https://github.com/Pockets-byte/NSV13 in…
Pockets-byte May 31, 2024
f0d4016
OVERLAP BEGONE
Pockets-byte May 31, 2024
de9f3ae
bleh
Pockets-byte May 31, 2024
47812e6
wallmounted pain
Pockets-byte May 31, 2024
b4fdfb3
AAAAAAAAAAAA
Pockets-byte May 31, 2024
7bc832b
forgot one last thing
Pockets-byte May 31, 2024
8179c2f
pete
Pockets-byte May 31, 2024
d47bc3d
the ship gained weight
Pockets-byte Jun 1, 2024
dbd1102
forgot the wirenodes
Pockets-byte Jun 1, 2024
067e0a5
area stuff
Pockets-byte Jun 1, 2024
1774b7b
theoretically last of the pipes
Pockets-byte Jun 1, 2024
fbdd323
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte Jun 1, 2024
4967f35
last one for a while
Pockets-byte Jun 1, 2024
ef2c5ec
Merge branch 'Robot-Ship' of https://github.com/Pockets-byte/NSV13 in…
Pockets-byte Jun 1, 2024
8f061e2
"SSSSS"
Pockets-byte Jun 1, 2024
c71fbd4
I swear this is the last fix
Pockets-byte Jun 1, 2024
1033025
late additions
Pockets-byte Jun 1, 2024
5f57fe3
I forgot the "s on a button
Pockets-byte Jun 1, 2024
04eede1
things I guess
Pockets-byte Jun 1, 2024
a0887c0
adds a playable solgov fighter, a fighter lasercannon, and maps them …
Pockets-byte Jun 2, 2024
135979f
Revert "adds a playable solgov fighter, a fighter lasercannon, and ma…
Pockets-byte Jun 2, 2024
ab0bf27
fixing more standout issues and areas
Pockets-byte Jun 6, 2024
d8bfd8f
cleaning
Pockets-byte Jun 6, 2024
7fe2aab
debugging
Pockets-byte Jun 7, 2024
c11b3b1
light switches mostly
Pockets-byte Jun 7, 2024
1e16ae1
more polish
Pockets-byte Jun 7, 2024
ce4f79d
oxygen tanks
Pockets-byte Jun 7, 2024
750ce93
description stuff
Pockets-byte Jun 7, 2024
fae4e13
description AAAAA
Pockets-byte Jun 7, 2024
9024a96
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte Jun 9, 2024
c5edd93
Oops
Pockets-byte Jun 12, 2024
c0c70c7
pain. 90% pain and 10% fixing
Pockets-byte Jun 12, 2024
e82ce78
headache
Pockets-byte Jun 12, 2024
3959204
cleanup and cramming a shuttle in somehow
Pockets-byte Jun 12, 2024
ca67b67
AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
Pockets-byte Jun 12, 2024
ff54321
cargo shuttle
Pockets-byte Jun 13, 2024
a448def
guidelines
Pockets-byte Jun 13, 2024
4c2715a
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte Jun 14, 2024
60d0c06
radiation shielding for the reactor, fixed airlocks. flavor warning, …
Pockets-byte Jun 15, 2024
ec6dfba
revamped science area
Pockets-byte Jun 16, 2024
9286d7a
areas
Pockets-byte Jun 16, 2024
c8604b7
slight power rerouting
Pockets-byte Jun 16, 2024
05fd47b
minor layering and a few other tweaks
Pockets-byte Jun 16, 2024
70a7e40
cleanup
Pockets-byte Jun 16, 2024
430bddc
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte Jul 18, 2024
1ffac0b
fixes missing asteroid protection on a portion of starboard maints
Pockets-byte Sep 2, 2024
cb92414
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte Sep 2, 2024
fffb9a2
touchup
Pockets-byte Sep 3, 2024
9a2740e
Removes shieldwall IDs
Pockets-byte Sep 6, 2024
492f3ab
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte Sep 8, 2024
2ce6692
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte Sep 14, 2024
ebdf61c
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte Oct 19, 2024
a67c253
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte Oct 27, 2024
00666a7
minor changes. mostly just floor stuff.
Pockets-byte Oct 27, 2024
44d6591
Apply suggestions from code review
Pockets-byte Nov 21, 2024
af839f5
Update vnmk3.dmm
Pockets-byte Nov 21, 2024
cc0e036
hindsight is 20/20
Pockets-byte Nov 21, 2024
acf638e
Merge branch 'BeeStation:master' into Robot-Ship
Pockets-byte Nov 21, 2024
a6ab252
last reference
Pockets-byte Nov 21, 2024
c23557e
Merge branch 'Robot-Ship' of https://github.com/Pockets-byte/NSV13 in…
Pockets-byte Nov 21, 2024
a2cad88
ferry space
Pockets-byte Nov 21, 2024
ab552e6
fixes most other issues
Pockets-byte Nov 21, 2024
da00f78
request console hell
Pockets-byte Nov 21, 2024
4a09838
fixes pixel_y = 0
Pockets-byte Nov 21, 2024
12c9e8c
fixed cargo windoor access. etc
Pockets-byte Nov 22, 2024
2ac2969
complete cargo redesign
Pockets-byte Nov 23, 2024
39b3061
not sure what changed?
Pockets-byte Nov 23, 2024
78705ec
no more spirited away starring cargo shuttle
Pockets-byte Nov 23, 2024
c10b842
forgot ammo for the hangar
Pockets-byte Dec 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -188,3 +188,4 @@ Temporary Items
# Common build tooling, C B T
!/tools/build


3 changes: 3 additions & 0 deletions _maps/_basemap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
#include "map_files\Aetherwhisp\Aetherwhisp2.dmm"
#include "map_files\Aetherwhisp\Aetherwhisp1.dmm"

//Von Neumann
#include "map_files\vonneumann\VNmk3.dmm"

//Gladius
#include "map_files\Gladius\Gladius1.dmm"
#include "map_files\Gladius\Gladius2.dmm"
Expand Down
47 changes: 47 additions & 0 deletions _maps/map_files/vonneumann/job_changes.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
__ ___ _ _
\ \ / / | | ||
\ \ / / | \ ||
\ \__/ / | |\ \||
\___/ |_| \__| C L A S S

pardon my godawful ascii art. it has been some time. anyway this is a solgov ship with a focus on *compactness* and *muni*(suprisingly, it's possible)
*/
// Munitechs get something to do on this ship. the jobs I just couldn't cram in don't though
MAP_REMOVE_JOB(curator)
MAP_REMOVE_JOB(lawyer)
MAP_REMOVE_JOB(chaplain)
MAP_REMOVE_JOB(virologist)
MAP_REMOVE_JOB(brig_phys)
MAP_REMOVE_JOB(deputy)
MAP_REMOVE_JOB(air_traffic_controller)
/datum/job/bartender/New()
..()
MAP_JOB_CHECK
total_positions = 1

/datum/job/cook/New()
..()
MAP_JOB_CHECK
total_positions = 1

/datum/job/pilot/New()
..()
MAP_JOB_CHECK
total_positions = 2

/datum/job/munitions_tech/New() // this ship needs gunners, or it will not achieve it's full firepower.
..()
MAP_JOB_CHECK
total_positions = 4

/datum/uplink_item/explosives/syndicate_bomb/New()
. = ..()

if(SSmapping?.config?.map_name != JOB_MODIFICATION_MAP_NAME)
return
limited_stock = 0 //This ship is way too small for this shit. //I second this, litterally, I am stealing it.
cant_discount = TRUE
surplus = 0

#undef JOB_MODIFICATION_MAP_NAME
Loading
Loading