Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into fuck-you
Browse files Browse the repository at this point in the history
  • Loading branch information
@Erikafox
Erikafox committed Sep 23, 2024
2 parents 2f9204a + 468b8d9 commit befce97
Show file tree
Hide file tree
Showing 40 changed files with 1,005 additions and 516 deletions.
1 change: 1 addition & 0 deletions _maps/configs/syndicate_panacea.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"map_name": "Panacea-class Infirm Vessel",
"map_short_name": "Panacea-class",
"map_path": "_maps/shuttles/syndicate/syndicate_panacea.dmm",
"faction": "/datum/faction/syndicate/suns",
"description": "Shortly after Solcon breached the Oort Cloud, SUNS joined into the Syndicate Coalition. Holding close ties to both the ACLF and GEC, students jumped at the opportunity to see the rest of the galaxy. The Panacea-class was the first of its kind out of Sol, moving typically planetside inpatient care to a space vessel and jumping system to system. The Panacea class is a moderately well supplied ship, allowing for emergency pharmaceutical compounding, mental and physical therapy, and general medical work, while doubling as a student run vessel.",
"tags": [
"Generalist",
Expand Down
183 changes: 108 additions & 75 deletions _maps/shuttles/inteq/inteq_colossus.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,29 +180,6 @@
/obj/effect/turf_decal/industrial/warning/fulltile,
/turf/open/floor/engine/hull/reinforced/interior,
/area/ship/maintenance/starboard)
"cd" = (
/obj/item/storage/backpack/messenger/inteq,
/obj/item/storage/backpack/messenger/inteq,
/obj/item/storage/backpack/messenger/inteq,
/obj/item/clothing/head/beret/sec/inteq,
/obj/item/clothing/head/beret/sec/inteq,
/obj/item/clothing/head/beret/sec/inteq,
/obj/item/clothing/head/soft/inteq,
/obj/item/clothing/head/soft/inteq,
/obj/item/clothing/head/soft/inteq,
/obj/structure/closet/wall/directional/north{
icon_door = "orange_wall";
name = "uniform closet"
},
/obj/machinery/firealarm/directional/east,
/obj/item/clothing/suit/hooded/wintercoat/security/inteq,
/obj/item/clothing/suit/hooded/wintercoat/security/inteq,
/obj/item/clothing/suit/hooded/wintercoat/security/inteq,
/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
/turf/open/floor/plasteel/grimy,
/area/ship/crew)
"cq" = (
/obj/structure/cable{
icon_state = "1-2"
Expand Down Expand Up @@ -268,6 +245,29 @@
/obj/machinery/newscaster/directional/west,
/turf/open/floor/plasteel/dark,
/area/ship/crew/office)
"cT" = (
/obj/item/storage/backpack/messenger/inteq,
/obj/item/storage/backpack/messenger/inteq,
/obj/item/storage/backpack/messenger/inteq,
/obj/item/clothing/head/beret/sec/inteq,
/obj/item/clothing/head/beret/sec/inteq,
/obj/item/clothing/head/beret/sec/inteq,
/obj/item/clothing/head/soft/inteq,
/obj/item/clothing/head/soft/inteq,
/obj/item/clothing/head/soft/inteq,
/obj/structure/closet/wall/directional/north{
icon_door = "orange_wall";
name = "uniform closet"
},
/obj/machinery/firealarm/directional/east,
/obj/item/clothing/suit/hooded/wintercoat/security/inteq,
/obj/item/clothing/suit/hooded/wintercoat/security/inteq,
/obj/item/clothing/suit/hooded/wintercoat/security/inteq,
/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
/turf/open/floor/plasteel/grimy,
/area/ship/crew)
"dq" = (
/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
/obj/structure/cable{
Expand Down Expand Up @@ -652,6 +652,13 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
"gH" = (
/obj/machinery/porta_turret/ship/ballistic{
dir = 6;
id = "colossus_grid"
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/crew)
"gJ" = (
/obj/effect/turf_decal/siding/thinplating/corner{
dir = 8
Expand Down Expand Up @@ -894,6 +901,25 @@
},
/turf/open/floor/plating,
/area/ship/engineering)
"ja" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/corner/opaque/brown{
dir = 4
},
/obj/effect/turf_decal/corner/opaque/yellow{
dir = 1
},
/obj/machinery/turretid/ship{
pixel_y = 24;
id = "colossus_grid"
},
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"jo" = (
/obj/machinery/atmospherics/components/unary/tank/toxins{
piping_layer = 1
Expand Down Expand Up @@ -1111,6 +1137,13 @@
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/fore)
"mb" = (
/obj/machinery/porta_turret/ship/ballistic{
dir = 5;
id = "colossus_grid"
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/hallway/port)
"mq" = (
/obj/structure/cable{
icon_state = "1-8"
Expand Down Expand Up @@ -1430,12 +1463,6 @@
/obj/effect/turf_decal/techfloor,
/turf/open/floor/plasteel/tech/grid,
/area/ship/crew/cryo)
"qJ" = (
/obj/machinery/porta_turret/ship/ballistic{
dir = 9
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/bridge)
"qK" = (
/obj/structure/cable/yellow{
icon_state = "1-4"
Expand Down Expand Up @@ -1706,6 +1733,13 @@
/obj/item/pen,
/turf/open/floor/plasteel/dark,
/area/ship/crew/office)
"sT" = (
/obj/machinery/porta_turret/ship/ballistic{
dir = 5;
id = "colossus_grid"
},
/turf/closed/wall/mineral/plastitanium,
/area/ship/crew)
"td" = (
/obj/structure/cable{
icon_state = "1-2"
Expand Down Expand Up @@ -2033,6 +2067,13 @@
"vH" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/cargo)
"vJ" = (
/obj/machinery/porta_turret/ship/ballistic{
dir = 5;
id = "colossus_grid"
},
/turf/closed/wall/mineral/plastitanium,
/area/ship/maintenance/port)
"vZ" = (
/obj/effect/turf_decal/industrial/warning/fulltile,
/obj/machinery/door/poddoor{
Expand Down Expand Up @@ -2135,12 +2176,6 @@
},
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"xh" = (
/obj/machinery/porta_turret/ship/ballistic{
dir = 5
},
/turf/closed/wall/mineral/plastitanium,
/area/ship/bridge)
"xr" = (
/obj/effect/turf_decal/trimline/opaque/yellow/line{
dir = 1
Expand Down Expand Up @@ -2406,6 +2441,13 @@
},
/turf/open/floor/plating,
/area/ship/maintenance/port)
"Bi" = (
/obj/machinery/porta_turret/ship/ballistic{
dir = 9;
id = "colossus_grid"
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/crew/office)
"Bj" = (
/obj/effect/turf_decal/trimline/opaque/yellow/line,
/obj/effect/turf_decal/siding/thinplating,
Expand Down Expand Up @@ -3005,12 +3047,6 @@
/obj/machinery/atmospherics/pipe/simple/orange/hidden/layer1,
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
"Hu" = (
/obj/machinery/porta_turret/ship/ballistic{
dir = 6
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/bridge)
"HD" = (
/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
/obj/structure/cable{
Expand Down Expand Up @@ -3486,24 +3522,6 @@
/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/dark,
/area/ship/crew/office)
"NH" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
},
/obj/machinery/turretid/lethal{
pixel_y = 22
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/corner/opaque/brown{
dir = 4
},
/obj/effect/turf_decal/corner/opaque/yellow{
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"NP" = (
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/corner/opaque/yellow,
Expand Down Expand Up @@ -3611,6 +3629,13 @@
},
/turf/open/floor/engine/hull/reinforced,
/area/ship/maintenance/starboard)
"OI" = (
/obj/machinery/porta_turret/ship/ballistic{
dir = 6;
id = "colossus_grid"
},
/turf/closed/wall/mineral/plastitanium,
/area/ship/maintenance/starboard)
"OV" = (
/obj/structure/cable{
icon_state = "2-4"
Expand Down Expand Up @@ -3764,6 +3789,13 @@
},
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"Qw" = (
/obj/machinery/porta_turret/ship/ballistic{
dir = 10;
id = "colossus_grid"
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/security/armory)
"QC" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 10
Expand Down Expand Up @@ -3820,12 +3852,6 @@
/obj/machinery/light/directional/north,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"QZ" = (
/obj/machinery/porta_turret/ship/ballistic{
dir = 10
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/bridge)
"Rb" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/on{
name = "exhaust injector"
Expand Down Expand Up @@ -3917,6 +3943,13 @@
/obj/effect/landmark/start/station_engineer,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"RZ" = (
/obj/machinery/porta_turret/ship/ballistic{
dir = 6;
id = "colossus_grid"
},
/turf/closed/wall/mineral/plastitanium,
/area/ship/security)
"Sa" = (
/obj/effect/turf_decal/borderfloor{
dir = 4
Expand Down Expand Up @@ -4758,7 +4791,7 @@ XJ
(8,1,1) = {"
XJ
XJ
xh
vJ
bo
bo
bo
Expand All @@ -4774,7 +4807,7 @@ rl
rl
rl
rl
Oa
OI
XJ
"}
(9,1,1) = {"
Expand Down Expand Up @@ -4955,7 +4988,7 @@ XJ
"}
(17,1,1) = {"
XJ
qJ
Bi
ZB
ZB
ZB
Expand All @@ -4973,7 +5006,7 @@ Dq
Dq
Dq
Dq
QZ
Qw
"}
(18,1,1) = {"
XJ
Expand Down Expand Up @@ -5193,7 +5226,7 @@ XA
XA
XA
XA
Oa
RZ
"}
(28,1,1) = {"
Yy
Expand All @@ -5219,7 +5252,7 @@ XJ
"}
(29,1,1) = {"
XJ
Ll
mb
hD
hD
hD
Expand Down Expand Up @@ -5287,7 +5320,7 @@ XJ
XJ
XJ
tX
NH
ja
tI
Ae
Sj
Expand Down Expand Up @@ -5320,7 +5353,7 @@ fN
fN
Yr
zF
cd
cT
GW
vq
gu
Expand Down Expand Up @@ -5364,11 +5397,11 @@ XJ
XJ
XJ
XJ
xh
sT
xT
xT
xT
Hu
gH
XJ
"}
(36,1,1) = {"
Expand Down
Loading

0 comments on commit befce97

Please sign in to comment.