Skip to content

Jackrip hasn't disabled the github bot yet fellas, we can still talk in here! #496

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.

Sign up for GitHub

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
BBBBAface wants to merge 33 commits into
base: master
Choose a base branch
from
Open

Jackrip hasn't disabled the github bot yet fellas, we can still talk in here! #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
1c8e47d
All my files related to shiptest/voidcrew
BBBBAface Oct 29, 2022
120de49
Delete NEU_lamia.json
BBBBAface Oct 29, 2022
67a3d39
wrong floor haha and i forgot a ship
BBBBAface Oct 30, 2022
9687efc
i am very good at uploading the right files
BBBBAface Oct 30, 2022
b724fff
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
BBBBAface Oct 30, 2022
f9e74d9
fixes some small shit
BBBBAface Oct 30, 2022
0cf5709
IGNORE this
BBBBAface Nov 3, 2022
f1c8e9e
i forgot holopads llmao
BBBBAface Nov 4, 2022
a8bf15e
Update head_of_personnel.dm
BBBBAface Nov 12, 2022
c95300d
Update lamia.dmm
BBBBAface Nov 12, 2022
5668b69
tweaks and many nerfs
BBBBAface Dec 8, 2022
e20fd20
Update KOS_crescent.json
BBBBAface Dec 8, 2022
1ea5810
Update KOS_greenpill.json
BBBBAface Dec 8, 2022
db2fa57
Update KOS_lamia.json
BBBBAface Dec 8, 2022
0d45eec
Update KOS_merlin.json
BBBBAface Dec 8, 2022
800053f
Update KOS_greenpill.json
BBBBAface Dec 8, 2022
e846d4b
fills medkit
BBBBAface Dec 8, 2022
8dc552a
Update NT-C_clipper.json
BBBBAface Dec 8, 2022
ff0d579
Update KOS_greenpill.json
BBBBAface Dec 8, 2022
0432041
Update KOS_lamia.json
BBBBAface Dec 8, 2022
4213ce2
minor tweaks
BBBBAface Dec 9, 2022
b31aafa
Add files via upload
BBBBAface Dec 10, 2022
cdebf6f
tweaks
BBBBAface Dec 11, 2022
b149a2f
Update simulated.dm
BBBBAface Dec 12, 2022
9cb59df
tweaks
BBBBAface Dec 12, 2022
be8b8b7
Update lamia.dmm
BBBBAface Dec 12, 2022
74c20d4
Update lamia.dmm
BBBBAface Dec 12, 2022
bc8f3f9
Add files via upload
BBBBAface Dec 14, 2022
5da0e91
"final" tweaks based on playtesting
BBBBAface Dec 15, 2022
18f5488
fixes
BBBBAface Dec 16, 2022
6f06fc5
Update KOS_roguemalf.json
BBBBAface Dec 16, 2022
3d39aa6
Add files via upload
BBBBAface Dec 18, 2022
0b26f34
merlin final fixes
BBBBAface Dec 20, 2022
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
3,411 changes: 3,411 additions & 0 deletions _maps/RandomRuins/SpaceRuins/nanotrasen_office.dmm
View file
Open in desktop

Large diffs are not rendered by default.

27 changes: 27 additions & 0 deletions _maps/configs/KOS_crescent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Crescent-class Freighter",
"map_short_name": "Crescent-class",
"prefix": "KOS",
"namelists": ["MYTHOLOGICAL"],
"map_path": "_maps/shuttles/shiptest/voidcrew/crescent.dmm",
"map_id": "crescnt",
"limit": 3,
"job_slots": {
"ArchWizard": {
"outfit": "/datum/outfit/job/captain/wizard",
"officer": true,
"slots": 1
},
"Destruction Specialist": {
"outfit": "/datum/outfit/job/security/wizard",
"officer": true,
"slots": 3
},
"Novice Spellcaster": {
"outfit": "/datum/outfit/job/assistant/wizard",
"slots": 3
}
},
"cost": 999
}
23 changes: 23 additions & 0 deletions _maps/configs/KOS_greenpill.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Greenpill-class Scrying Ship",
"map_short_name": "Greenpill-class",
"prefix": "KOS",
"namelists": ["MYTHOLOGICAL"],
"map_path": "_maps/shuttles/shiptest/voidcrew/greenpill.dmm",
"map_id": "greenpill",
"limit": 3,
"job_slots": {
"Wizard": {
"outfit": "/datum/outfit/job/captain/wizard",
"officer": true,
"slots": 1
},
"Wizard's Apprentice": {
"outfit": "/datum/outfit/job/head_of_personnel/wizard",
"officer": true,
"slots": 2
}
},
"cost": 390
}
24 changes: 24 additions & 0 deletions _maps/configs/KOS_lamia.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Lamia-class Magery Ship",
"map_short_name": "Lamia-class",
"prefix": "KOS",
"map_path": "_maps/shuttles/shiptest/lamia.dmm",
"map_id": "lamia",
"job_slots": {
"ArchWizard": {
"outfit": "/datum/outfit/job/captain/wizard",
"officer": true,
"slots": 1
},
"Destruction Specialist": {
"outfit": "/datum/outfit/job/security/wizard",
"slots": 2
},
"Novice Spellcaster": {
"outfit": "/datum/outfit/job/assistant/wizard",
"slots": 3
}
},
"cost": 700
}
35 changes: 35 additions & 0 deletions _maps/configs/KOS_merlin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Merlin-class Power Projector",
"map_short_name": "Merlin-class",
"prefix": "KOS",
"namelists": ["MYTHOLOGICAL"],
"map_path": "_maps/shuttles/shiptest/voidcrew/merlin.dmm",
"map_id": "merlin",
"limit": 1,
"job_slots": {
"ArchWizard": {
"outfit": "/datum/outfit/job/captain/wizard",
"officer": true,
"slots": 1
},
"Artifact Curator": {
"outfit": "/datum/outfit/job/head_of_personnel/wizard",
"officer": true,
"slots": 1
},
"Destruction Specialist": {
"outfit": "/datum/outfit/job/security/wizard",
"slots": 8
},
"Restoration Specialist": {
"outfit": "/datum/outfit/job/doctor/wizard",
"slots": 2
},
"Novice Wizard": {
"outfit": "/datum/outfit/job/assistant/wizard",
"slots": 4
}
},
"cost": 2100
}
22 changes: 22 additions & 0 deletions _maps/configs/KOS_roguemalf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Malfunction-class Silicon Ship",
"map_short_name": "Malfunction-class",
"prefix": "KOS",
"namelists": ["GENERAL", "MYTHOLOGICAL"],
"map_path": "_maps/shuttles/shiptest/voidcrew/Roguemalf.dmm",
"map_id": "roguemalf",
"limit": 2,
"job_slots": {
"Ai Technician": {
"outfit": "/datum/outfit/job/captain",
"officer": true,
"slots": 1
},
"Silicon Engineer": {
"outfit": "/datum/outfit/job/engineer",
"slots": 2
}
},
"cost": 1350
}
32 changes: 32 additions & 0 deletions _maps/configs/NEU_Homestead.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"map_name": "Homestead-class Destiny Manifestation Craft",
"map_short_name": "Homestead-class",
"prefix": "NEU",
"namelists": ["GENERAL", "MYTHOLOGICAL"],
"map_path": "_maps/shuttles/shiptest/voidcrew/Homestead.dmm",
"map_id": "Homestead",
"job_slots": {
"Mayor": {
"outfit": "/datum/outfit/job/captain",
"officer": true,
"slots": 1
},
"Frontier Medic": {
"outfit": "/datum/outfit/job/doctor",
"slots": 2
},
"Architect": {
"outfit": "/datum/outfit/job/engineer",
"slots": 4
},
"Settlement Security": {
"outfit": "/datum/outfit/job/security",
"slots": 4
},
"Settler": {
"outfit": "/datum/outfit/job/assistant",
"slots": 8
}
},
"cost": 900
}
39 changes: 0 additions & 39 deletions _maps/configs/NEU_lamia.json
View file
Open in desktop

This file was deleted.

33 changes: 33 additions & 0 deletions _maps/configs/NEU_tanker.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"prefix": "NEU",
"namelists": ["GENERAL", "MYTHOLOGICAL"],
"map_name": "Prometheus-Class Plasma Tanker",
"map_short_name": "Prometheus-class",
"map_path": "_maps/shuttles/shiptest/nanotrasen_tanker.dmm",
"limit": 2,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/captain/nt",
"officer": true,
"slots": 1
},
"Medical Officer": {
"outfit": "/datum/outfit/job/doctor/surgeon",
"slots": 1
},
"Plasma Technician": {
"outfit": "/datum/outfit/job/atmos/firefighter",
"slots": 2
},
"Security Officer": {
"outfit": "/datum/outfit/job/security",
"slots": 2
},
"Assistant": {
"outfit": "/datum/outfit/job/assistant/engineeringspecialist",
"slots": 1
}
},
"cost": 300
}
38 changes: 38 additions & 0 deletions _maps/configs/NT-C_clipper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"prefix": "NT-C",
"namelists": ["GENERAL", "BRITISH_NAVY", "MERCANTILE", "SPACE"],
"map_name": "Indisputable-class Secure Transport",
"map_short_name": "Indisputable-class",
"map_path": "_maps/shuttles/shiptest/voidcrew/nanotrasen_clipper.dmm",
"limit": 2,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/captain/nt",
"officer": true,
"slots": 1
},
"First Mate": {
"outfit": "/datum/outfit/job/head_of_personnel/nt",
"officer": true,
"slots": 1
},
"Cargo Technician": {
"outfit": "/datum/outfit/job/cargo_tech",
"slots": 2
},
"Engineering Specialist": {
"outfit": "/datum/outfit/job/engineer",
"slots": 1
},
"Security Officer": {
"outfit": "/datum/outfit/job/security",
"slots": 5
},
"Paramedic": {
"outfit": "/datum/outfit/job/paramedic",
"slots": 2
}
},
"cost": 750
}
36 changes: 27 additions & 9 deletions _maps/shuttles/shiptest/cricket.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@
/obj/effect/spawner/structure/window/shuttle,
/obj/machinery/door/firedoor/window,
/obj/structure/curtain/cloth/fancy,
/obj/structure/grille,
/obj/machinery/door/poddoor/shutters/preopen{
id = "sgwindowshut";
name = "external shutters"
Expand Down Expand Up @@ -605,7 +604,6 @@
},
/obj/effect/spawner/structure/window/shuttle,
/obj/machinery/door/firedoor/window,
/obj/structure/grille,
/obj/machinery/door/poddoor/shutters/preopen{
id = "sgwindowshut";
name = "external shutters"
Expand Down Expand Up @@ -1026,7 +1024,6 @@
"mm" = (
/obj/effect/spawner/structure/window/shuttle,
/obj/machinery/door/firedoor/window,
/obj/structure/grille,
/obj/machinery/door/poddoor/shutters/preopen{
id = "sgwindowshut";
name = "external shutters"
Expand Down Expand Up @@ -1189,7 +1186,6 @@
"nO" = (
/obj/effect/spawner/structure/window/shuttle,
/obj/machinery/door/firedoor/window,
/obj/structure/grille,
/obj/machinery/door/poddoor/shutters/preopen{
id = "sgwindowshut";
name = "external shutters"
Expand Down Expand Up @@ -1790,6 +1786,15 @@
},
/turf/open/floor/carpet/nanoweave/blue,
/area/ship/hallway/fore)
"vu" = (
/obj/effect/spawner/structure/window/shuttle,
/obj/machinery/door/firedoor/window,
/obj/machinery/door/poddoor/shutters/preopen{
id = "sgwindowshut";
name = "external shutters"
},
/turf/open/floor/plating,
/area/ship/hallway/fore)
"vA" = (
/obj/structure/cable{
icon_state = "1-2"
Expand Down Expand Up @@ -3065,7 +3070,13 @@
/turf/open/floor/carpet/nanoweave/beige,
/area/ship/hallway/starboard)
"IR" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/obj/effect/spawner/structure/window/shuttle,
/obj/machinery/door/firedoor/window,
/obj/machinery/door/poddoor/shutters/preopen{
id = "sgwindowshut";
name = "external shutters"
},
/turf/open/floor/plating,
/area/ship/hallway/starboard)
"Jr" = (
/obj/structure/cable{
Expand Down Expand Up @@ -3364,7 +3375,6 @@
"MZ" = (
/obj/effect/spawner/structure/window/shuttle,
/obj/machinery/door/firedoor/window,
/obj/structure/grille,
/obj/machinery/door/poddoor/shutters/preopen{
id = "sgwindowshut";
name = "external shutters"
Expand Down Expand Up @@ -3629,7 +3639,6 @@
"QD" = (
/obj/effect/spawner/structure/window/shuttle,
/obj/machinery/door/firedoor/window,
/obj/structure/grille,
/obj/machinery/door/poddoor/shutters/preopen{
id = "sgwindowshut";
name = "external shutters"
Expand Down Expand Up @@ -3778,6 +3787,15 @@
/obj/effect/turf_decal/corner/black/diagonal,
/turf/open/floor/plasteel,
/area/ship/storage)
"SF" = (
/obj/effect/spawner/structure/window/shuttle,
/obj/machinery/door/firedoor/window,
/obj/machinery/door/poddoor/shutters/preopen{
id = "sgwindowshut";
name = "external shutters"
},
/turf/open/floor/plating,
/area/ship/medical)
"SJ" = (
/obj/machinery/power/smes/shuttle/precharged{
dir = 4
Expand Down Expand Up @@ -4907,7 +4925,7 @@ QD
zR
"}
(21,1,1) = {"
YU
SF
Wt
ZB
Ww
Expand Down Expand Up @@ -5096,7 +5114,7 @@ RA
XD
SC
SC
WY
vu
qd
ts
BT
Expand Down
Loading