Skip to content

Commit 6144b87

Browse files
authored
[IDB IGNORE] [MDB IGNORE] orbital support update 1 / 3 (#7361)
1 parent bb19285 commit 6144b87

File tree

136 files changed

+13204
-8754
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+13204
-8754
lines changed

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"*.dmi": "dmiEditor.dmiEditor"
2929
},
3030
"[javascript][typescript][typescriptreact][javascriptreact]": {
31-
"editor.defaultFormatter": "vscode.typescript-language-features"
31+
"editor.defaultFormatter": "esbenp.prettier-vscode"
3232
},
3333
"editor.formatOnSave": true
3434
}

citadel.dme

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@
220220
#include "code\__DEFINES\dcs\signals\signals_atom\signals_movable-defense.dm"
221221
#include "code\__DEFINES\dcs\signals\signals_atom\signals_movable-update_icon.dm"
222222
#include "code\__DEFINES\dcs\signals\signals_carbon\signals_carbon_appearance.dm"
223+
#include "code\__DEFINES\dcs\signals\signals_client\signals_client-mouse.dm"
223224
#include "code\__DEFINES\dcs\signals\signals_human\signals_loadout.dm"
224225
#include "code\__DEFINES\dcs\signals\signals_item\signals_item-clickchain.dm"
225226
#include "code\__DEFINES\dcs\signals\signals_item\signals_item-interaction.dm"
@@ -228,6 +229,8 @@
228229
#include "code\__DEFINES\dcs\signals\signals_item\signals_item_mouse.dm"
229230
#include "code\__DEFINES\dcs\signals\signals_item\signals_item_storage.dm"
230231
#include "code\__DEFINES\dcs\signals\signals_mob\signals_mob-clickchain.dm"
232+
#include "code\__DEFINES\dcs\signals\signals_mob\signals_mob-client.dm"
233+
#include "code\__DEFINES\dcs\signals\signals_mob\signals_mob-examine.dm"
231234
#include "code\__DEFINES\dcs\signals\signals_mob\signals_mob-inventory.dm"
232235
#include "code\__DEFINES\dcs\signals\signals_mob\signals_mob-perspective.dm"
233236
#include "code\__DEFINES\dcs\signals\signals_mob\signals_mob-say.dm"
@@ -486,6 +489,7 @@
486489
#include "code\__HELPERS\math\angle.dm"
487490
#include "code\__HELPERS\math\distance.dm"
488491
#include "code\__HELPERS\math\fractions.dm"
492+
#include "code\__HELPERS\math\trajectory.dm"
489493
#include "code\__HELPERS\matrices\color_matrix.dm"
490494
#include "code\__HELPERS\matrices\transform_matrix.dm"
491495
#include "code\__HELPERS\misc\sonar.dm"
@@ -624,6 +628,7 @@
624628
#include "code\controllers\subsystem\legacy_lore.dm"
625629
#include "code\controllers\subsystem\lighting.dm"
626630
#include "code\controllers\subsystem\machines.dm"
631+
#include "code\controllers\subsystem\map_sectors.dm"
627632
#include "code\controllers\subsystem\materials.dm"
628633
#include "code\controllers\subsystem\media_tracks.dm"
629634
#include "code\controllers\subsystem\minimaps.dm"
@@ -718,7 +723,6 @@
718723
#include "code\controllers\subsystem\processing\process_5fps.dm"
719724
#include "code\controllers\subsystem\processing\processing.dm"
720725
#include "code\controllers\subsystem\processing\projectiles.dm"
721-
#include "code\controllers\subsystem\processing\turfs.dm"
722726
#include "code\controllers\subsystem\sound\_sound.dm"
723727
#include "code\controllers\subsystem\sound\channel_manager.dm"
724728
#include "code\controllers\subsystem\sound\soundbyte_manager.dm"
@@ -847,7 +851,6 @@
847851
#include "code\datums\components\connect_loc_behalf.dm"
848852
#include "code\datums\components\custom_transform.dm"
849853
#include "code\datums\components\cyberpsychosis.dm"
850-
#include "code\datums\components\gps_signal.dm"
851854
#include "code\datums\components\horror_aura.dm"
852855
#include "code\datums\components\jousting.dm"
853856
#include "code\datums\components\orbiter.dm"
@@ -857,9 +860,13 @@
857860
#include "code\datums\components\atoms\fishing_spot.dm"
858861
#include "code\datums\components\atoms\gm_ping.dm"
859862
#include "code\datums\components\atoms\gm_ping_topmost.dm"
863+
#include "code\datums\components\atoms\gps_signal.dm"
864+
#include "code\datums\components\atoms\high_altitude_signal.dm"
860865
#include "code\datums\components\atoms\latently_radioactive.dm"
861866
#include "code\datums\components\atoms\radiation_listener.dm"
862867
#include "code\datums\components\atoms\radioactive.dm"
868+
#include "code\datums\components\clients\client_face_cursor.dm"
869+
#include "code\datums\components\clients\client_freezoom_handler.dm"
863870
#include "code\datums\components\crafting\crafting.dm"
864871
#include "code\datums\components\crafting\guncrafting.dm"
865872
#include "code\datums\components\items\passive_parry.dm"
@@ -868,6 +875,7 @@
868875
#include "code\datums\components\mobs\mob_feign_impairment.dm"
869876
#include "code\datums\components\mobs\mob_self_horizontal_inversion.dm"
870877
#include "code\datums\components\mobs\mob_self_vertical_inversion.dm"
878+
#include "code\datums\components\mobs\mob_zoom_binding.dm"
871879
#include "code\datums\components\mobs\parry_frame.dm"
872880
#include "code\datums\components\movable\aquarium.dm"
873881
#include "code\datums\components\movable\spatial_grid.dm"
@@ -1022,6 +1030,7 @@
10221030
#include "code\datums\soundbytes\announcer.dm"
10231031
#include "code\datums\soundbytes\defs\clicker.dm"
10241032
#include "code\datums\soundbytes\defs\explosion.dm"
1033+
#include "code\datums\soundbytes\defs\misc.dm"
10251034
#include "code\datums\soundbytes\defs\sparks.dm"
10261035
#include "code\datums\soundbytes\defs\spray.dm"
10271036
#include "code\datums\soundbytes\defs\talksound.dm"
@@ -1145,13 +1154,15 @@
11451154
#include "code\game\atoms\action_feedback.dm"
11461155
#include "code\game\atoms\appearance.dm"
11471156
#include "code\game\atoms\atom-audit.dm"
1157+
#include "code\game\atoms\atom-chat.dm"
11481158
#include "code\game\atoms\atom-construction.dm"
11491159
#include "code\game\atoms\atom-context_menu.dm"
11501160
#include "code\game\atoms\atom-damage.dm"
11511161
#include "code\game\atoms\atom-defense.dm"
11521162
#include "code\game\atoms\atom-examine.dm"
11531163
#include "code\game\atoms\atom-logging.dm"
11541164
#include "code\game\atoms\atom-materials.dm"
1165+
#include "code\game\atoms\atom-mouse.dm"
11551166
#include "code\game\atoms\atom-preload.dm"
11561167
#include "code\game\atoms\atom-radiation.dm"
11571168
#include "code\game\atoms\atom-tool_system-visuals.dm"
@@ -1283,8 +1294,8 @@
12831294
#include "code\game\content\factions\derelict\derelict.dm\automatons\minutemen\dragonfly_variations\sniper.dm"
12841295
#include "code\game\content\factions\derelict\derelict.dm\automatons\minutemen\hornet_variations\irradiator.dm"
12851296
#include "code\game\content\factions\derelict\derelict.dm\automatons\minutemen\hornet_variations\neurophage.dm"
1286-
#include "code\game\content\factions\derelict\derelict.dm\automatons\minutemen\hornet_variations\thermite.dm"
12871297
#include "code\game\content\factions\derelict\derelict.dm\automatons\minutemen\hornet_variations\poison.dm"
1298+
#include "code\game\content\factions\derelict\derelict.dm\automatons\minutemen\hornet_variations\thermite.dm"
12881299
#include "code\game\content\factions\derelict\derelict.dm\automatons\minutemen\hornet_variations\venom.dm"
12891300
#include "code\game\content\factions\derelict\derelict.dm\blight\blight.dm"
12901301
#include "code\game\content\factions\derelict\derelict.dm\blight\blight_abilities.dm"
@@ -2286,7 +2297,9 @@
22862297
#include "code\game\turfs\baseturfs.dm"
22872298
#include "code\game\turfs\change_turf.dm"
22882299
#include "code\game\turfs\simulated.dm"
2300+
#include "code\game\turfs\turf-baseturf-helpers.dm"
22892301
#include "code\game\turfs\turf-construction.dm"
2302+
#include "code\game\turfs\turf-movement.dm"
22902303
#include "code\game\turfs\turf.dm"
22912304
#include "code\game\turfs\turf_ao.dm"
22922305
#include "code\game\turfs\turf_flick_animations.dm"
@@ -2297,6 +2310,7 @@
22972310
#include "code\game\turfs\simulated\lava.dm"
22982311
#include "code\game\turfs\simulated\shuttle.dm"
22992312
#include "code\game\turfs\simulated\shuttle_ceiling.dm"
2313+
#include "code\game\turfs\simulated\simulated-examine.dm"
23002314
#include "code\game\turfs\simulated\sky.dm"
23012315
#include "code\game\turfs\simulated\floor\floor-construction.dm"
23022316
#include "code\game\turfs\simulated\floor\floor-flooring.dm"
@@ -2764,6 +2778,7 @@
27642778
#include "code\modules\catalogue\cataloguer_visuals.dm"
27652779
#include "code\modules\catalogue\cataloguer_vr.dm"
27662780
#include "code\modules\client\client-admin.dm"
2781+
#include "code\modules\client\client-mouse.dm"
27672782
#include "code\modules\client\client-stat.dm"
27682783
#include "code\modules\client\client-upload.dm"
27692784
#include "code\modules\client\client.dm"
@@ -3513,6 +3528,7 @@
35133528
#include "code\modules\loadout\accessories\utility.dm"
35143529
#include "code\modules\logging\event_logger.dm"
35153530
#include "code\modules\logging\logging.dm"
3531+
#include "code\modules\logging\api\air_support.dm"
35163532
#include "code\modules\logging\api\attack.dm"
35173533
#include "code\modules\logging\api\clickchain.dm"
35183534
#include "code\modules\logging\api\construction.dm"
@@ -3856,6 +3872,7 @@
38563872
#include "code\modules\mob\mob-status_indicator.dm"
38573873
#include "code\modules\mob\mob-status_procs.dm"
38583874
#include "code\modules\mob\mob-synth.dm"
3875+
#include "code\modules\mob\mob-vv.dm"
38593876
#include "code\modules\mob\mob.dm"
38603877
#include "code\modules\mob\mob_defines.dm"
38613878
#include "code\modules\mob\mob_helpers.dm"
@@ -4719,10 +4736,13 @@
47194736
#include "code\modules\organs\subtypes\unbreakable.dm"
47204737
#include "code\modules\organs\subtypes\unseverable.dm"
47214738
#include "code\modules\overmap\bounds.dm"
4739+
#include "code\modules\overmap\entity_query.dm"
47224740
#include "code\modules\overmap\object.dm"
47234741
#include "code\modules\overmap\public.dm"
47244742
#include "code\modules\overmap\entity\entity-hooks.dm"
47254743
#include "code\modules\overmap\entity\entity-location.dm"
4744+
#include "code\modules\overmap\entity\entity-misc.dm"
4745+
#include "code\modules\overmap\entity\entity-movement.dm"
47264746
#include "code\modules\overmap\entity\entity-physics.dm"
47274747
#include "code\modules\overmap\entity\entity.dm"
47284748
#include "code\modules\overmap\entity\overmap_initializer.dm"
@@ -4732,6 +4752,7 @@
47324752
#include "code\modules\overmap\entity\overmap_initializer\shuttle.dm"
47334753
#include "code\modules\overmap\entity\overmap_location\map.dm"
47344754
#include "code\modules\overmap\entity\overmap_location\shuttle.dm"
4755+
#include "code\modules\overmap\entity\subtypes\orbital_deployment_transit.dm"
47354756
#include "code\modules\overmap\events\event_handler.dm"
47364757
#include "code\modules\overmap\events\fluff_planets.dm"
47374758
#include "code\modules\overmap\events\generation.dm"
@@ -4963,6 +4984,7 @@
49634984
#include "code\modules\projectiles\ammunition\calibers\special\dart.dm"
49644985
#include "code\modules\projectiles\ammunition\calibers\special\foam.dm"
49654986
#include "code\modules\projectiles\ammunition\calibers\special\microbattery.dm"
4987+
#include "code\modules\projectiles\ammunition\calibers\special\mortar.dm"
49664988
#include "code\modules\projectiles\ammunition\calibers\special\musket.dm"
49674989
#include "code\modules\projectiles\ammunition\calibers\special\pellet.dm"
49684990
#include "code\modules\projectiles\ammunition\calibers\special\rocket.dm"
@@ -5382,6 +5404,22 @@
53825404
#include "code\modules\roles\jobs\job_types\station\supply\cargo_technician.dm"
53835405
#include "code\modules\roles\jobs\job_types\station\supply\quartermaster.dm"
53845406
#include "code\modules\roles\jobs\job_types\station\supply\shaft_miner.dm"
5407+
#include "code\modules\sectors\air_support\rangefinder.dm"
5408+
#include "code\modules\sectors\air_support\signal_flare.dm"
5409+
#include "code\modules\sectors\air_support\mortar\mortar-ammo_casing.dm"
5410+
#include "code\modules\sectors\air_support\mortar\mortar-projectile.dm"
5411+
#include "code\modules\sectors\air_support\mortar\mortar.dm"
5412+
#include "code\modules\sectors\air_support\mortar\mortar_effect.dm"
5413+
#include "code\modules\sectors\air_support\mortar\mortar_flight.dm"
5414+
#include "code\modules\sectors\air_support\mortar\mortar_kit.dm"
5415+
#include "code\modules\sectors\air_support\orbital_deployment\orbital_deployment_area.dm"
5416+
#include "code\modules\sectors\air_support\orbital_deployment\orbital_deployment_controller.dm"
5417+
#include "code\modules\sectors\air_support\orbital_deployment\orbital_deployment_marker.dm"
5418+
#include "code\modules\sectors\air_support\orbital_deployment\orbital_deployment_telegraph.dm"
5419+
#include "code\modules\sectors\air_support\orbital_deployment\orbital_deployment_transit.dm"
5420+
#include "code\modules\sectors\air_support\orbital_deployment\orbital_deployment_translation.dm"
5421+
#include "code\modules\sectors\air_support\orbital_deployment\orbital_deployment_turfs.dm"
5422+
#include "code\modules\sectors\air_support\orbital_deployment\orbital_deployment_zone.dm"
53855423
#include "code\modules\security levels\keycard authentication.dm"
53865424
#include "code\modules\security levels\security levels.dm"
53875425
#include "code\modules\shieldgen\emergency_shield.dm"
@@ -6029,6 +6067,7 @@
60296067
#include "maps\sectors\delerict_casino\delerict_casino-misc.dm"
60306068
#include "maps\sectors\delerict_casino\delerict_casino.dm"
60316069
#include "maps\sectors\desert_192\desert_192.dm"
6070+
#include "maps\sectors\event\halloween_map\halloween_ball.dm"
60326071
#include "maps\sectors\frozen_192\frozen_192.dm"
60336072
#include "maps\sectors\gaia_192\gaia_192.dm"
60346073
#include "maps\sectors\ice_comet\ice_comet-area.dm"
@@ -6053,7 +6092,6 @@
60536092
#include "maps\sectors\sky_planet\sky_planet-misc.dm"
60546093
#include "maps\sectors\sky_planet\sky_planet-shuttles.dm"
60556094
#include "maps\sectors\sky_planet\sky_planet.dm"
6056-
#include "maps\sectors\event\halloween_map\halloween_ball.dm"
60576095
#include "maps\sectors\solarstar_station\solar_station.dm"
60586096
#include "maps\sectors\solarstar_station\solar_station_areas.dm"
60596097
#include "maps\sectors\solarstar_station\solar_station_misc.dm"

code/__DEFINES/combat/body_zones.dm

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,20 @@
2323
#define BODY_ZONE_MOUTH "mouth"
2424
#define BODY_ZONE_EYES "eyes"
2525

26+
GLOBAL_REAL_LIST(all_body_zones) = list(
27+
BODY_ZONE_HEAD,
28+
BODY_ZONE_TORSO,
29+
BODY_ZONE_GROIN,
30+
BODY_ZONE_L_ARM,
31+
BODY_ZONE_L_FOOT,
32+
BODY_ZONE_L_HAND,
33+
BODY_ZONE_L_LEG,
34+
BODY_ZONE_R_ARM,
35+
BODY_ZONE_R_FOOT,
36+
BODY_ZONE_R_HAND,
37+
BODY_ZONE_R_LEG,
38+
)
39+
2640
/**
2741
* Simplify a target body zone to a more course one.
2842
*
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
//* This file is explicitly licensed under the MIT license. *//
2+
//* Copyright (c) 2025 Citadel Station Developers *//
3+
4+
/// Fired when mouse is moved.
5+
#define COMSIG_CLIENT_MOUSE_MOVED "client-mouse-moved"

code/__DEFINES/dcs/signals/signals_mob/signals_mob-clickchain.dm

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
//* This file is explicitly licensed under the MIT license. *//
22
//* Copyright (c) 2024 Citadel Station Developers *//
33

4+
//* low level clickchain *//
5+
6+
/// fired with (target, location, control, params)
7+
#define COMSIG_MOB_CLICK_ON_OVERRIDE "mob-click-on-override"
8+
/// fired with (target, location, control, params)
9+
#define COMSIG_MOB_CLICK_ON_SPECIAL "mob-click-on-special"
10+
11+
/// common return for all COMSIG_MOB_CLICK_ON_*
12+
#define SIGNAL_RAISE_MOB_CLICK_HANDLED (1<<0)
13+
414
//* dynamic hooks *//
515

616
/**
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/// Sent when a mob/login() finishes: (client)
2+
#define COMSIG_MOB_CLIENT_LOGIN "mob-login"
3+
/// Sent when a mob/logout() begins: (client)
4+
#define COMSIG_MOB_CLIENT_LOGOUT "mob-logout"
5+
/// Sent before a mob/logout() begins: (client)
6+
#define COMSIG_MOB_CLIENT_PRE_LOGOUT "mob-pre-logout"
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/// sent with (atom, list/examine_results, distance)
2+
/// * examine_results may be null if atom blocked examine
3+
/// * distance may be null
4+
#define COMSIG_MOB_EXAMINATE "mob-examinate"

code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,11 @@
1515
#define COMSIG_MOB_RECEIVE_MAGIC "mob_receive_magic"
1616
#define COMPONENT_MAGIC_BLOCKED (1<<0)
1717

18-
/// From base of /mob/verb/examinate(): (atom/target)
19-
#define COMSIG_MOB_EXAMINATE "mob_examinate"
2018
/// From base of /mob/update_sight(): ()
2119
#define COMSIG_MOB_UPDATE_SIGHT "mob_update_sight"
2220
//// From /mob/living/say(): ()
2321
#define COMSIG_MOB_SAY "mob_say"
2422

25-
/// Sent when a mob/login() finishes: (client)
26-
#define COMSIG_MOB_CLIENT_LOGIN "comsig_mob_client_login"
27-
/// Sent when a mob/logout() begins: (client)
28-
#define COMSIG_MOB_CLIENT_LOGOUT "comsig_mob_client_logout"
29-
3023
/// From base of mob/Life(): (seconds, times_fired)
3124
#define COMSIG_MOB_ON_LIFE "mob_life"
3225
#define COMPONENT_INTERRUPT_PHYSICAL_LIFE (1<<0)

code/__DEFINES/misc.dm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s
3737
#define INVISIBILITY_LEVEL_TWO 45
3838
#define INVISIBILITY_OBSERVER 60
3939
#define INVISIBILITY_EYE 61
40+
/// for various map helpers that should be able to be seen in certain cases
41+
#define INVISIBILITY_MAP_HELPER 70
4042

4143
#define SEE_INVISIBLE_MINIMUM 5
4244
#define SEE_INVISIBLE_NOLIGHTING 15

code/__DEFINES/objects/type_generation.dm

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
//* This file is explicitly licensed under the MIT license. *//
22
//* Copyright (c) 2023 Citadel Station developers. *//
33

4+
/**
5+
* Makes standard wall-mount types. Things will point **away** from their wall.
6+
*/
47
#define CREATE_WALL_MOUNTING_TYPES(TYPE) \
58
##TYPE/north_mount{ \
69
dir = SOUTH; \
@@ -42,43 +45,51 @@
4245
##TYPE/north_mount{ \
4346
dir = SOUTH; \
4447
pixel_y = SHIFT; \
48+
base_pixel_y = SHIFT; \
4549
} \
4650
##TYPE/south_mount{ \
4751
dir = NORTH; \
4852
pixel_y = -SHIFT; \
53+
base_pixel_y = -SHIFT; \
4954
} \
5055
##TYPE/east_mount{ \
5156
dir = WEST; \
5257
pixel_x = SHIFT; \
58+
base_pixel_x = SHIFT; \
5359
} \
5460
##TYPE/west_mount{ \
5561
dir = EAST; \
5662
pixel_x = -SHIFT; \
63+
base_pixel_x = -SHIFT; \
5764
} \
5865
##TYPE/auto_mount/Initialize(){ \
59-
auto_orient_wallmount_single_preinit(); \
66+
auto_orient_wallmount_single_preinit(SHIFT); \
6067
return ..(); \
6168
}
6269

6370
#define CREATE_WALL_MOUNTING_TYPES_SHIFTED_AUTOSPRITE(TYPE, SHIFT, AUTOSPRITE) \
6471
##TYPE/north_mount{ \
6572
dir = SOUTH; \
6673
pixel_y = SHIFT; \
74+
base_pixel_y = SHIFT; \
6775
} \
6876
##TYPE/south_mount{ \
6977
dir = NORTH; \
7078
pixel_y = -SHIFT; \
79+
base_pixel_y = -SHIFT; \
7180
} \
7281
##TYPE/east_mount{ \
7382
dir = WEST; \
7483
pixel_x = SHIFT; \
84+
base_pixel_x = SHIFT; \
7585
} \
7686
##TYPE/west_mount{ \
7787
dir = EAST; \
7888
pixel_x = -SHIFT; \
89+
base_pixel_x = -SHIFT; \
7990
} \
8091
##TYPE/auto_mount { icon_state = AUTOSPRITE } \
8192
##TYPE/auto_mount/Initialize(){ \
82-
auto_orient_wallmount_single_preinit(); \
93+
auto_orient_wallmount_single_preinit(SHIFT); \
8394
return ..(); \
8495
}

0 commit comments

Comments
 (0)