Skip to content

Commit

Permalink
Ronins ships fixes (#453)
Browse files Browse the repository at this point in the history
* SHF

* Kau config edit

* Light ships fixes

* Back to old
  • Loading branch information
RonninNiko authored Apr 25, 2024
1 parent 2234298 commit df2480a
Show file tree
Hide file tree
Showing 4 changed files with 104 additions and 80 deletions.
17 changes: 8 additions & 9 deletions _maps/_mod_celadon/configs/syndicate_kau_delta.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"prefix": "SSV",
"namelists": [
"CYBERSUN",
"SPACE",
"NATURAL_AGGRESSIVE"
"CYBERSUN"
],
"map_name": "Kau-Delta class ship",
"description": "Боевой корвет класса Кау-Дельта. Нацелен на подрыв деятельности НТ в секторе, в спешке был переоборудован для самообеспечения на протяжение продолжительного времени. Несмотря на причастность киберсан к созданию корабля, экипаж состоит из разных подразделений Синдиката.",
Expand All @@ -14,25 +12,26 @@
"map_short_name": "Kau-class",
"map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm",
"map_id": "cybersun_kau",
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/syndicate/captain/cybersun",
"officer": true,
"slots": 1
},
"Lieutenant": {
"outfit": "/datum/outfit/job/syndicate/head_of_personnel/cybersun",
"Sergeant": {
"outfit": "/datum/outfit/job/syndicate/hos/gorlex",
"officer": true,
"slots": 1
},
"Engineer": {
"outfit": "/datum/outfit/job/syndicate/engineer/cybersun",
"slots": 1
},
"Operative": {
"outfit": "/datum/outfit/job/syndicate/security",
"slots": 2
},
"Engineer": {
"outfit": "/datum/outfit/job/syndicate/engineer/cybersun",
"slots": 1
},
"Junior Agent": {
"outfit": "/datum/outfit/job/syndicate/assistant",
"slots": 2
Expand Down
45 changes: 22 additions & 23 deletions _maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -991,8 +991,6 @@
/obj/machinery/iv_drip,
/obj/machinery/light/directional/south,
/obj/item/reagent_containers/blood/universal,
/obj/item/reagent_containers/blood/universal,
/obj/item/reagent_containers/blood/universal,
/turf/open/floor/plasteel/patterned/brushed,
/area/ship/medical)
"kx" = (
Expand Down Expand Up @@ -1114,7 +1112,6 @@
pixel_x = 34
},
/obj/structure/table/reinforced,
/obj/machinery/jukebox/boombox,
/obj/machinery/button/door{
id = "exec_armorysh2";
name = "Armory shuters";
Expand All @@ -1129,6 +1126,23 @@
/obj/effect/turf_decal/industrial/traffic{
dir = 8
},
/obj/machinery/recharger{
pixel_y = 9;
pixel_x = -6
},
/obj/machinery/recharger{
pixel_y = 9;
pixel_x = 6
},
/obj/machinery/recharger{
pixel_y = -1;
pixel_x = 6
},
/obj/machinery/recharger{
pixel_y = -1;
pixel_x = -6
},
/obj/item/screwdriver,
/turf/open/floor/plasteel/dark,
/area/ship/cargo)
"ml" = (
Expand Down Expand Up @@ -1334,8 +1348,6 @@
/turf/open/floor/plasteel/tech,
/area/ship/security/armory)
"ok" = (
/obj/item/healthanalyzer/advanced,
/obj/item/healthanalyzer/advanced,
/obj/item/clothing/glasses/hud/health/sunglasses,
/obj/item/clothing/glasses/hud/health/sunglasses,
/obj/item/storage/belt/medical/paramedic,
Expand Down Expand Up @@ -1600,7 +1612,10 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/spawner/lootdrop/maintenance/three,
/obj/item/storage/firstaid/brute,
/obj/item/storage/firstaid/fire{
pixel_y = -5
},
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"ru" = (
Expand Down Expand Up @@ -3640,28 +3655,12 @@
/area/ship/bridge)
"Us" = (
/obj/structure/table/reinforced,
/obj/machinery/recharger{
pixel_y = 9;
pixel_x = -6
},
/obj/machinery/recharger{
pixel_y = 9;
pixel_x = 6
},
/obj/machinery/recharger{
pixel_y = -1;
pixel_x = -6
},
/obj/machinery/recharger{
pixel_y = -1;
pixel_x = 6
},
/obj/structure/railing,
/obj/item/screwdriver,
/obj/structure/sign/poster/official/miners{
pixel_x = 32
},
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/machinery/jukebox/boombox,
/turf/open/floor/plasteel/dark,
/area/ship/cargo)
"UC" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,9 @@
/area/ship/cargo)
"nY" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/chair/comfy/grey/corpo{
dir = 4
},
/turf/open/floor/carpet/red_gold,
/area/ship/crew)
"oh" = (
Expand Down Expand Up @@ -847,6 +850,9 @@
/area/ship/engineering)
"sF" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/chair/comfy/grey/corpo{
dir = 4
},
/turf/open/floor/carpet/red_gold,
/area/ship/crew)
"sO" = (
Expand Down Expand Up @@ -1461,6 +1467,9 @@
"Ge" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/chair/comfy/grey/corpo{
dir = 8
},
/turf/open/floor/carpet/red_gold,
/area/ship/crew)
"Gz" = (
Expand Down Expand Up @@ -1940,6 +1949,9 @@
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/crew/dorm)
"UK" = (
/obj/structure/chair/comfy/grey/corpo{
dir = 8
},
/turf/open/floor/carpet/red_gold,
/area/ship/crew)
"UQ" = (
Expand Down
Loading

0 comments on commit df2480a

Please sign in to comment.