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

Dropship turf direction sprites #3642

Merged
merged 34 commits into from
Feb 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
e51f044
added kugamos dropship sprites and reworked mapping
mullenpaul Jun 15, 2023
6dd9b6f
found directional ert shuttle sprites
mullenpaul Jun 16, 2023
51084f8
Fixes pods
Nanu308 Jun 18, 2023
055d16f
Merge pull request #1 from Nanu308/forpaul
mullenpaul Jun 18, 2023
2fc9756
Doors
nauticall Jun 20, 2023
0903cbc
More doors!
nauticall Jul 19, 2023
6ba1877
Merge pull request #2 from nauticall/dropship-doors
mullenpaul Jul 20, 2023
5059ca2
reoriented sprites and door rotate into signal handler
mullenpaul Jul 29, 2023
c087d6e
got the rear ramp working
mullenpaul Jul 30, 2023
1728743
saving old work
mullenpaul Aug 23, 2023
5e2cfdf
Merge branch 'master' into dropship_rotation_sprites
mullenpaul Aug 23, 2023
a3533f7
saving existing changes
mullenpaul Sep 6, 2023
a95af59
Merge branch 'master' into dropship_rotation_sprites
mullenpaul Sep 6, 2023
5daac42
trying to resolve issues with tile rotation
mullenpaul Sep 6, 2023
33e1a8c
Merge branch 'master' into dropship_rotation_sprites
mullenpaul Sep 19, 2023
53d73db
Merge branch 'cmss13-devs:master' into dropship_rotation_sprites
mullenpaul Oct 5, 2023
a83b6f5
ported the window sprites across for dropships
mullenpaul Oct 5, 2023
d84025b
remove prefered direction in dropships
mullenpaul Oct 5, 2023
10bce7c
Merge branch 'master' into dropship_rotation_sprites
mullenpaul Oct 17, 2023
8a544cc
Merge branch 'master' into dropship_rotation_sprites
mullenpaul Oct 22, 2023
d018104
Update code/game/machinery/doors/multi_tile.dm
mullenpaul Oct 22, 2023
99e0424
Update code/game/machinery/doors/multi_tile.dm
mullenpaul Oct 22, 2023
3944707
Update code/game/machinery/doors/multi_tile.dm
mullenpaul Oct 22, 2023
76ebd0d
Update code/game/machinery/doors/multi_tile.dm
mullenpaul Oct 22, 2023
c41c661
Update code/game/machinery/doors/multi_tile.dm
mullenpaul Oct 22, 2023
183855b
Update code/game/machinery/doors/multi_tile.dm
mullenpaul Oct 22, 2023
8fcce63
Update code/game/machinery/doors/multi_tile.dm
mullenpaul Oct 22, 2023
0cc09ab
Update code/game/machinery/doors/multi_tile.dm
mullenpaul Oct 22, 2023
fffad4c
Update code/game/machinery/doors/multi_tile.dm
mullenpaul Oct 22, 2023
145600c
Update code/game/machinery/doors/multi_tile.dm
mullenpaul Oct 22, 2023
b573275
Merge branch 'master' into dropship_rotation_sprites
mullenpaul Feb 5, 2024
f0264ce
revert superfluous changes
mullenpaul Feb 5, 2024
504b238
removed instanced value changes
mullenpaul Feb 21, 2024
3b530eb
resolve merge conflicts
mullenpaul Feb 25, 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: 0 additions & 1 deletion code/game/machinery/doors/multi_tile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -569,4 +569,3 @@
icon = 'icons/obj/structures/doors/2x1almayerdoor_glass.dmi'
opacity = FALSE
glass = TRUE

11 changes: 11 additions & 0 deletions code/modules/cm_marines/dropship_equipment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
var/skill_required = SKILL_PILOT_TRAINED
var/combat_equipment = TRUE

/obj/structure/dropship_equipment/Initialize()
. = ..()
RegisterSignal(src, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_dir_change))

/obj/structure/dropship_equipment/Destroy()
QDEL_NULL(ammo_equipped)
if(linked_shuttle)
Expand All @@ -33,8 +37,15 @@
if(linked_console.selected_equipment && linked_console.selected_equipment == src)
linked_console.selected_equipment = null
linked_console = null
UnregisterSignal(src, COMSIG_ATOM_DIR_CHANGE)
. = ..()

/obj/structure/dropship_equipment/proc/on_dir_change(datum/source, old_dir, new_dir)
SIGNAL_HANDLER
if(old_dir == new_dir)
return
update_equipment()

/obj/structure/dropship_equipment/attack_alien(mob/living/carbon/xenomorph/current_xenomorph)
if(unslashable)
return XENO_NO_DELAY_ACTION
Expand Down
8 changes: 8 additions & 0 deletions code/modules/shuttle/shuttles/dropship.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,12 @@
door_control.add_door(air, "port")
if("aft_door")
door_control.add_door(air, "aft")
RegisterSignal(src, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_dir_change))

/obj/docking_port/mobile/marine_dropship/Destroy(force)
. = ..()
qdel(door_control)
UnregisterSignal(src, COMSIG_ATOM_DIR_CHANGE)

/obj/docking_port/mobile/marine_dropship/proc/control_doors(action, direction, force, asynchronous = TRUE)
// its been locked down by the queen
Expand Down Expand Up @@ -118,6 +120,12 @@
set_security_level(SEC_LEVEL_RED)
return

/obj/docking_port/mobile/marine_dropship/proc/on_dir_change(datum/source, old_dir, new_dir)
SIGNAL_HANDLER
for(var/place in shuttle_areas)
for(var/obj/structure/machinery/door/air in place)
air.handle_multidoor(old_dir, new_dir)

/obj/docking_port/mobile/marine_dropship/alamo
name = "Alamo"
id = DROPSHIP_ALAMO
Expand Down
8 changes: 5 additions & 3 deletions code/modules/shuttle/shuttles/ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@
air.breakable = FALSE
air.indestructible = TRUE
air.unacidable = TRUE
RegisterSignal(src, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_dir_change))

/obj/docking_port/mobile/emergency_response/enterTransit()
control_doors("force-lock-launch", force = TRUE, external_only = TRUE)
UnregisterSignal(src, COMSIG_ATOM_DIR_CHANGE)
..()

/obj/docking_port/mobile/emergency_response/proc/control_doors(action, force = FALSE, external_only = FALSE)
Expand Down Expand Up @@ -77,10 +79,10 @@
air.lock()
air.safe = 1

/obj/docking_port/mobile/emergency_response/setDir(newdir)
. = ..()
/obj/docking_port/mobile/emergency_response/proc/on_dir_change(datum/source, old_dir, new_dir)
SIGNAL_HANDLER
for(var/obj/structure/machinery/door/shuttle_door in doors)
shuttle_door.handle_multidoor()
shuttle_door.handle_multidoor(old_dir, new_dir)

// ERT Shuttle 1
/obj/docking_port/mobile/emergency_response/ert1
Expand Down
Binary file modified icons/obj/structures/doors/dropship1_cargo.dmi
Binary file not shown.
Binary file modified icons/obj/structures/doors/dropship1_pilot.dmi
Binary file not shown.
Binary file modified icons/obj/structures/doors/dropship1_side.dmi
Binary file not shown.
Binary file modified icons/obj/structures/doors/dropship2_cargo.dmi
Binary file not shown.
Binary file modified icons/obj/structures/doors/dropship2_pilot.dmi
Binary file not shown.
Binary file modified icons/obj/structures/doors/dropship2_side.dmi
Binary file not shown.
Binary file modified icons/obj/structures/props/almayer_props64.dmi
Binary file not shown.
Binary file modified icons/turf/dropship.dmi
Binary file not shown.
Binary file modified icons/turf/dropship2.dmi
Binary file not shown.
Binary file modified icons/turf/ert_shuttle.dmi
Binary file not shown.
Binary file modified icons/turf/escapepods.dmi
Binary file not shown.
142 changes: 72 additions & 70 deletions maps/shuttles/dropship_alamo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@
/obj/structure/shuttle/part/dropship1/transparent/nose_center,
/turf/template_noop,
/area/shuttle/drop1/sulaco)
"bc" = (
/obj/effect/attach_point/electronics/dropship1{
dir = 1;
attach_id = 5
},
/obj/structure/shuttle/part/dropship1/transparent/inner_left_weapons,
/turf/template_noop,
/area/shuttle/drop1/sulaco)
"be" = (
/obj/structure/shuttle/part/dropship1/transparent/upper_right_wing,
/turf/template_noop,
Expand Down Expand Up @@ -81,15 +73,6 @@
icon_state = "floor8"
},
/area/shuttle/drop1/sulaco)
"ed" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds1{
dir = 1;
id = "starboard_door"
},
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
/area/shuttle/drop1/sulaco)
"eD" = (
/obj/structure/shuttle/part/dropship1/transparent/engine_right_cap,
/turf/template_noop,
Expand Down Expand Up @@ -229,14 +212,6 @@
/obj/structure/shuttle/part/dropship1/transparent/left_outer_bottom_wing,
/turf/template_noop,
/area/shuttle/drop1/sulaco)
"sm" = (
/obj/effect/attach_point/fuel/dropship1{
attach_id = 10
},
/turf/closed/shuttle/dropship1/transparent{
icon_state = "28"
},
/area/shuttle/drop1/sulaco)
"sA" = (
/obj/structure/shuttle/part/dropship1/lower_left_wall,
/turf/open/space/basic,
Expand Down Expand Up @@ -319,6 +294,14 @@
icon_state = "63"
},
/area/shuttle/drop1/sulaco)
"BM" = (
/obj/effect/attach_point/crew_weapon/dropship1/floor{
attach_id = 9
},
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
/area/shuttle/drop1/sulaco)
"BS" = (
/turf/closed/shuttle/dropship1{
icon_state = "48"
Expand Down Expand Up @@ -369,6 +352,15 @@
icon_state = "39"
},
/area/shuttle/drop1/sulaco)
"GQ" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds1{
dir = 1;
id = "starboard_door"
},
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
/area/shuttle/drop1/sulaco)
"Ho" = (
/obj/structure/machinery/computer/dropship_weapons/dropship1,
/obj/structure/transmitter/rotary{
Expand Down Expand Up @@ -401,6 +393,23 @@
icon_state = "35"
},
/area/shuttle/drop1/sulaco)
"Iu" = (
/obj/effect/attach_point/fuel/dropship1{
dir = 1;
pixel_x = -32
},
/turf/closed/shuttle/dropship1/transparent{
icon_state = "33"
},
/area/shuttle/drop1/sulaco)
"IP" = (
/obj/effect/attach_point/electronics/dropship1{
dir = 1;
attach_id = 6
},
/obj/structure/shuttle/part/dropship1/transparent/inner_right_weapons,
/turf/template_noop,
/area/shuttle/drop1/sulaco)
"Jb" = (
/turf/closed/shuttle/dropship1/transparent{
icon_state = "80"
Expand All @@ -415,16 +424,10 @@
icon_state = "62"
},
/area/shuttle/drop1/sulaco)
"Kk" = (
/obj/effect/attach_point/crew_weapon/dropship1/floor{
attach_id = 7
},
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
"Kt" = (
/obj/structure/machinery/door/airlock/hatch/cockpit{
dir = 1
},
/area/shuttle/drop1/sulaco)
"KC" = (
/obj/structure/machinery/door/airlock/hatch/cockpit,
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
Expand All @@ -449,23 +452,6 @@
icon_state = "64"
},
/area/shuttle/drop1/sulaco)
"Nv" = (
/obj/effect/attach_point/crew_weapon/dropship1/floor{
attach_id = 8
},
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
/area/shuttle/drop1/sulaco)
"ND" = (
/obj/effect/attach_point/fuel/dropship1{
pixel_x = -32;
attach_id = 11
},
/turf/closed/shuttle/dropship1/transparent{
icon_state = "33"
},
/area/shuttle/drop1/sulaco)
"NQ" = (
/obj/structure/shuttle/part/dropship1/transparent/left_inner_bottom_wing,
/turf/template_noop,
Expand Down Expand Up @@ -506,9 +492,9 @@
icon_state = "rasputin15"
},
/area/shuttle/drop1/sulaco)
"PV" = (
"PA" = (
/obj/effect/attach_point/crew_weapon/dropship1/floor{
attach_id = 9
attach_id = 7
},
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
Expand Down Expand Up @@ -598,6 +584,14 @@
icon_state = "rasputin15"
},
/area/shuttle/drop1/sulaco)
"UN" = (
/obj/effect/attach_point/electronics/dropship1{
dir = 1;
attach_id = 5
},
/obj/structure/shuttle/part/dropship1/transparent/inner_left_weapons,
/turf/template_noop,
/area/shuttle/drop1/sulaco)
"Vm" = (
/turf/closed/shuttle/dropship1/transparent{
icon_state = "78"
Expand Down Expand Up @@ -634,7 +628,15 @@
icon_state = "rasputin7"
},
/area/shuttle/drop1/sulaco)
"XP" = (
"XH" = (
/obj/effect/attach_point/fuel/dropship1{
dir = 1
},
/turf/closed/shuttle/dropship1/transparent{
icon_state = "28"
},
/area/shuttle/drop1/sulaco)
"XI" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds1{
id = "port_door";
dir = 2
Expand All @@ -643,13 +645,13 @@
icon_state = "rasputin15"
},
/area/shuttle/drop1/sulaco)
"Ye" = (
/obj/effect/attach_point/electronics/dropship1{
dir = 1;
attach_id = 6
"YV" = (
/obj/effect/attach_point/crew_weapon/dropship1/floor{
attach_id = 8
},
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
/obj/structure/shuttle/part/dropship1/transparent/inner_right_weapons,
/turf/template_noop,
/area/shuttle/drop1/sulaco)
"Za" = (
/turf/closed/shuttle/dropship1{
Expand Down Expand Up @@ -683,7 +685,7 @@ mb
mb
FA
Oq
sm
XH
iz
EN
mb
Expand All @@ -700,7 +702,7 @@ Et
iI
JP
il
XP
XI
mW
qn
sA
Expand All @@ -717,7 +719,7 @@ NQ
mb
mb
mb
bc
UN
oo
TK
ws
Expand Down Expand Up @@ -787,7 +789,7 @@ ax
EB
Py
tR
KC
Kt
dU
Ph
BB
Expand All @@ -796,11 +798,11 @@ BB
OK
OU
il
Kk
PA
il
Nv
YV
il
PV
BM
il
mb
mb
Expand Down Expand Up @@ -855,7 +857,7 @@ Wg
mb
mb
mb
Ye
IP
oo
TK
cr
Expand Down Expand Up @@ -884,7 +886,7 @@ iv
zV
MP
il
ed
GQ
nC
nE
rl
Expand Down Expand Up @@ -913,7 +915,7 @@ mb
mb
eD
Gw
ND
Iu
qy
Jm
mb
Expand Down
Loading
Loading