From 308d76557214ac2bf764a93bc755779283568eda Mon Sep 17 00:00:00 2001 From: Helg2 Date: Fri, 18 Oct 2024 11:15:33 +0300 Subject: [PATCH 1/2] move defines --- code/__DEFINES/objects.dm | 6 ++++++ code/game/objects/structures/dropship_equipment.dm | 10 ---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/code/__DEFINES/objects.dm b/code/__DEFINES/objects.dm index 645b6252ffb..626bc774db0 100644 --- a/code/__DEFINES/objects.dm +++ b/code/__DEFINES/objects.dm @@ -240,6 +240,12 @@ GLOBAL_LIST_INIT(restricted_camera_networks, list( //Those networks can only be #define DROPPOD_ACTIVE 2 #define DROPPOD_LANDED 3 +#define DROPSHIP_WEAPON "dropship_weapon" +#define DROPSHIP_CREW_WEAPON "dropship_crew_weapon" +#define DROPSHIP_ELECTRONICS "dropship_electronics" +#define DROPSHIP_FUEL_EQP "dropship_fuel_equipment" +#define DROPSHIP_COMPUTER "dropship_computer" + ///Burn level applied by lava if it calls fire_act #define LAVA_BURN_LEVEL 60 diff --git a/code/game/objects/structures/dropship_equipment.dm b/code/game/objects/structures/dropship_equipment.dm index a5292616375..7c2a07377e7 100644 --- a/code/game/objects/structures/dropship_equipment.dm +++ b/code/game/objects/structures/dropship_equipment.dm @@ -1,13 +1,3 @@ - -#define DROPSHIP_WEAPON "dropship_weapon" -#define DROPSHIP_CREW_WEAPON "dropship_crew_weapon" -#define DROPSHIP_ELECTRONICS "dropship_electronics" -#define DROPSHIP_FUEL_EQP "dropship_fuel_equipment" -#define DROPSHIP_COMPUTER "dropship_computer" - - -//the bases onto which you attach dropship equipments. - /obj/effect/attach_point name = "equipment attach point" desc = "A place where heavy equipment can be installed with a powerloader." From f8419ccc89d65d9d177f396b9d241f82ec47d895 Mon Sep 17 00:00:00 2001 From: Helg2 Date: Fri, 18 Oct 2024 11:21:33 +0300 Subject: [PATCH 2/2] cas weaponry doesn't fit other shuttles --- code/__DEFINES/objects.dm | 1 + code/game/objects/structures/dropship_equipment.dm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/objects.dm b/code/__DEFINES/objects.dm index 626bc774db0..4865b3da080 100644 --- a/code/__DEFINES/objects.dm +++ b/code/__DEFINES/objects.dm @@ -241,6 +241,7 @@ GLOBAL_LIST_INIT(restricted_camera_networks, list( //Those networks can only be #define DROPPOD_LANDED 3 #define DROPSHIP_WEAPON "dropship_weapon" +#define DROPSHIP_WEAPON_CAS "dropship_weapon_cas" #define DROPSHIP_CREW_WEAPON "dropship_crew_weapon" #define DROPSHIP_ELECTRONICS "dropship_electronics" #define DROPSHIP_FUEL_EQP "dropship_fuel_equipment" diff --git a/code/game/objects/structures/dropship_equipment.dm b/code/game/objects/structures/dropship_equipment.dm index 7c2a07377e7..1be2e7a184f 100644 --- a/code/game/objects/structures/dropship_equipment.dm +++ b/code/game/objects/structures/dropship_equipment.dm @@ -61,7 +61,6 @@ loaded_equipment.update_equipment() - /obj/effect/attach_point/weapon name = "weapon system attach point" icon_state = "equip_base_front" @@ -77,6 +76,7 @@ /obj/effect/attach_point/weapon/cas ship_tag = SHUTTLE_CAS_DOCK + base_category = DROPSHIP_WEAPON_CAS icon = 'icons/Marine/casship.dmi' icon_state = "15" @@ -627,7 +627,7 @@ /obj/structure/dropship_equipment/cas/weapon name = "abstract weapon" icon = 'icons/Marine/mainship_props64.dmi' - equip_category = DROPSHIP_WEAPON + equip_category = DROPSHIP_WEAPON_CAS bound_width = 32 bound_height = 64 dropship_equipment_flags = USES_AMMO|IS_WEAPON|IS_INTERACTABLE|FIRE_MISSION_ONLY