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

New tad "Barge" #858

Merged
merged 13 commits into from
Dec 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
297 changes: 297 additions & 0 deletions _maps/shuttles/minidropship_barge.dmm
Original file line number Diff line number Diff line change
@@ -0,0 +1,297 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/obj/structure/bed/chair/dropship/passenger{
dir = 1
},
/obj/docking_port/mobile/marine_dropship/minidropship,
/turf/open/floor/plating/plating_catwalk,
/area/shuttle/minidropship)
"b" = (
/obj/structure/table/mainship,
/turf/open/floor/plating/plating_catwalk,
/area/shuttle/minidropship)
"c" = (
/turf/closed/shuttle/ert/engines/right{
dir = 1
},
/area/shuttle/minidropship)
"d" = (
/obj/machinery/door/poddoor/mainship/open/nonsmoothing{
id = "minidropship_podlock"
},
/obj/machinery/camera/autoname/mainship/dropship_two,
/obj/machinery/door/poddoor/shutters/transit/nonsmoothing,
/turf/open/floor/plating/plating_catwalk,
/area/shuttle/minidropship)
"f" = (
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plating/plating_catwalk,
/area/shuttle/minidropship)
"j" = (
/obj/machinery/door/airlock/mainship/command{
dir = 1
},
/turf/open/floor/plating/plating_catwalk,
/area/shuttle/minidropship)
"n" = (
/obj/structure/closet/walllocker/hydrant/extinguisher,
/turf/open/floor/mainship/floor,
/area/shuttle/minidropship)
"o" = (
/obj/structure/dropship_piece/tadpole/engine{
dir = 1;
pixel_x = 23
},
/turf/closed/wall/mainship/outer/canterbury,
/area/shuttle/minidropship)
"q" = (
/obj/structure/window/framed/mainship/canterbury/dropship/reinforced,
/turf/open/floor/plating/plating_catwalk,
/area/shuttle/minidropship)
"s" = (
/obj/machinery/light/floor{
dir = 8
},
/turf/open/floor/plating/plating_catwalk,
/area/shuttle/minidropship)
"u" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plating/plating_catwalk,
/area/shuttle/minidropship)
"w" = (
/obj/structure/bed/chair/dropship/passenger{
dir = 1
},
/turf/open/floor/plating/plating_catwalk,
/area/shuttle/minidropship)
"z" = (
/turf/open/floor/mainship/floor,
/area/shuttle/minidropship)
"B" = (
/obj/machinery/door_control{
id = "minidropship_podlock";
name = "inner door-control"
},
/turf/open/floor/mainship/floor,
/area/shuttle/minidropship)
"D" = (
/obj/structure/table/mainship,
/obj/item/storage/toolbox/mechanical,
/turf/open/floor/plating/plating_catwalk,
/area/shuttle/minidropship)
"E" = (
/obj/machinery/cic_maptable,
/obj/machinery/camera/autoname/mainship/dropship_two,
/turf/open/floor/mainship/mono,
/area/shuttle/minidropship)
"F" = (
/obj/machinery/door/poddoor/mainship/open/nonsmoothing{
id = "minidropship_podlock"
},
/obj/machinery/door/poddoor/shutters/transit/nonsmoothing,
/turf/open/floor/plating/plating_catwalk,
/area/shuttle/minidropship)
"G" = (
/obj/structure/dropship_piece/tadpole/engine{
dir = 1;
pixel_x = 23
},
/obj/structure/dropship_piece/tadpole/rearleft,
/obj/structure/dropship_piece/two/weapon/rightright{
dir = 1;
pixel_y = 32
},
/turf/open/space/basic,
/area/shuttle/minidropship)
"I" = (
/obj/machinery/light{
dir = 8
},
/obj/machinery/vending/nanomed/tadpolemed{
dir = 4
},
/turf/open/floor/plating/plating_catwalk,
/area/shuttle/minidropship)
"J" = (
/turf/closed/shuttle/ert/engines/left{
dir = 1
},
/area/shuttle/minidropship)
"L" = (
/obj/structure/barricade/metal{
dir = 8
},
/turf/open/floor/plating/plating_catwalk,
/area/shuttle/minidropship)
"M" = (
/obj/structure/window/framed/mainship/canterbury/dropship/reinforced{
layer = 1
},
/obj/machinery/door/poddoor/shutters/transit/nonsmoothing,
/obj/machinery/door/poddoor/mainship/open/nonsmoothing{
id = "minidropship_podlock"
},
/turf/open/floor/plating/plating_catwalk,
/area/shuttle/minidropship)
"N" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/minidropship,
/turf/open/floor/mainship/mono,
/area/shuttle/minidropship)
"O" = (
/obj/structure/bed/chair/dropship/passenger,
/turf/open/floor/plating/plating_catwalk,
/area/shuttle/minidropship)
"P" = (
/obj/structure/dropship_piece/tadpole/rearright,
/obj/structure/dropship_piece/tadpole/engine{
dir = 1;
pixel_x = -23
},
/obj/structure/dropship_piece/two/weapon/leftleft{
dir = 1;
pixel_y = 32
},
/turf/open/space/basic,
/area/shuttle/minidropship)
"R" = (
/turf/closed/wall/mainship/outer/canterbury,
/area/shuttle/minidropship)
"S" = (
/obj/structure/barricade/metal{
dir = 4
},
/turf/open/floor/plating/plating_catwalk,
/area/shuttle/minidropship)
"V" = (
/obj/machinery/door/poddoor/mainship/open/nonsmoothing{
id = "minidropship_podlock";
dir = 1
},
/obj/machinery/door/poddoor/shutters/transit/nonsmoothing{
dir = 1
},
/turf/open/floor/plating/plating_catwalk,
/area/shuttle/minidropship)
"W" = (
/turf/open/floor/plating/plating_catwalk,
/area/shuttle/minidropship)
"X" = (
/obj/machinery/light/floor{
dir = 4
},
/turf/open/floor/plating/plating_catwalk,
/area/shuttle/minidropship)
"Y" = (
/obj/structure/dropship_piece/tadpole/engine{
dir = 1;
pixel_x = -23
},
/turf/closed/wall/mainship/outer/canterbury,
/area/shuttle/minidropship)
"Z" = (
/obj/structure/bed/chair/dropship/pilot{
dir = 1
},
/turf/open/floor/mainship/floor,
/area/shuttle/minidropship)

(1,1,1) = {"
P
d
F
F
Y
M
R
R
R
J
"}
(2,1,1) = {"
V
W
s
W
I
L
j
u
b
R
"}
(3,1,1) = {"
V
W
W
W
O
w
R
B
z
J
"}
(4,1,1) = {"
V
W
W
W
O
w
q
N
Z
R
"}
(5,1,1) = {"
V
W
W
W
O
a
q
E
Z
R
"}
(6,1,1) = {"
V
W
W
W
O
w
R
n
z
c
"}
(7,1,1) = {"
V
W
X
W
f
S
j
f
D
R
"}
(8,1,1) = {"
G
d
F
F
o
M
R
R
R
c
"}
5 changes: 5 additions & 0 deletions code/datums/shuttles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,11 @@
description = "A Tadpole model was modified to expedite the delivery of supplies to combat zones. The weapon system attach point had to be removed to enlarge the cargo area."
display_name = "Tadpole Cargo Model"

/datum/map_template/shuttle/minidropship/barge
suffix = "_barge"
description = "A cargo barge used for transporting significant forces. The combat modules were sacrificed for the sake of the internal volume."
display_name = "Tadpole Barge Model"

/datum/map_template/shuttle/escape_pod
shuttle_id = SHUTTLE_ESCAPE_POD
name = "Escape Pod"
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/machinery/computer/dropship_picker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
"_mobile_bar" = 'icons/ui_icons/dropshippicker/_mobile_bar.png',
"_umbilical" = 'icons/ui_icons/dropshippicker/_umbilical.png',
"_cargo" = 'icons/ui_icons/dropshippicker/_cargo.png',
"_barge" = 'icons/ui_icons/dropshippicker/_barge.png',
)

/obj/machinery/computer/dropship_picker/ui_act(action, list/params, datum/tgui/ui)
Expand Down
Binary file added icons/UI_Icons/dropshippicker/_barge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading