From 092b2e0c423081d5d8f9309e46d29b553e565079 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Wed, 5 Jan 2022 21:15:33 -0600 Subject: [PATCH 1/3] uh --- code/game/mecha/equipment/tools/storage_compartment.dm | 3 +++ code/game/mecha/mecha.dm | 4 ++-- vorestation.dme | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 code/game/mecha/equipment/tools/storage_compartment.dm diff --git a/code/game/mecha/equipment/tools/storage_compartment.dm b/code/game/mecha/equipment/tools/storage_compartment.dm new file mode 100644 index 0000000000..c592d23748 --- /dev/null +++ b/code/game/mecha/equipment/tools/storage_compartment.dm @@ -0,0 +1,3 @@ +/obj/item/mecha_parts/mecha_equipment/auxbay + name = "auxillary exosuit storage bay" + desc = "" \ No newline at end of file diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index c83fb398b2..dda2121bfc 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -2483,8 +2483,8 @@ var/obj/item/mecha_parts/mecha_equipment/equip = top_filter.getObj("select_equip") if(equip) src.selected = equip - src.occupant_message("You switch to [equip]") - src.visible_message("[src] raises [equip]") + src.occupant_message("You switch to [equip].") + src.visible_message("[src] raises [equip].") send_byjax(src.occupant,"exosuit.browser","eq_list",src.get_equipment_list()) return if(href_list["eject"]) diff --git a/vorestation.dme b/vorestation.dme index cbd2147b60..ebf4ff14a7 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1032,6 +1032,7 @@ #include "code\game\mecha\equipment\tools\shield_omni.dm" #include "code\game\mecha\equipment\tools\sleeper.dm" #include "code\game\mecha\equipment\tools\speedboost.dm" +#include "code\game\mecha\equipment\tools\storage_compartment.dm" #include "code\game\mecha\equipment\tools\syringe_gun.dm" #include "code\game\mecha\equipment\tools\teleporter.dm" #include "code\game\mecha\equipment\tools\tools.dm" @@ -4091,7 +4092,7 @@ #include "maps\southern_cross\loadout\loadout_suit.dm" #include "maps\southern_cross\loadout\loadout_uniform.dm" #include "maps\southern_cross\loadout\loadout_vr.dm" -#include "maps\stellardelight\stellar_delight.dm" +#include "maps\virgo_minitest\virgo_minitest.dm" #include "maps\submaps\_helpers.dm" #include "maps\submaps\_readme.dm" #include "maps\submaps\engine_submaps\engine.dm" From 46d15446a73fee2bc0a4358b70906a3c78fe8e05 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Thu, 3 Feb 2022 02:44:55 -0600 Subject: [PATCH 2/3] quake 3 arena was a good game --- .../equipment/tools/storage_compartment.dm | 26 ++++++++++++++++-- code/game/objects/items/paintkit.dm | 14 ++++++++++ code/modules/research/mechfab_designs.dm | 16 +++++++++++ icons/mecha/mecha_equipment_vr.dmi | Bin 5194 -> 7277 bytes vorestation.dme | 2 +- 5 files changed, 55 insertions(+), 3 deletions(-) diff --git a/code/game/mecha/equipment/tools/storage_compartment.dm b/code/game/mecha/equipment/tools/storage_compartment.dm index c592d23748..1cbd0acce5 100644 --- a/code/game/mecha/equipment/tools/storage_compartment.dm +++ b/code/game/mecha/equipment/tools/storage_compartment.dm @@ -1,3 +1,25 @@ -/obj/item/mecha_parts/mecha_equipment/auxbay +/obj/item/mecha_parts/mecha_equipment/storage name = "auxillary exosuit storage bay" - desc = "" \ No newline at end of file + desc = "An auxillary storage compartment, for attaching to exosuits." + icon_state = "mecha_tiler" + icon = 'icons/mecha/mecha_equipment_vr.dmi' + origin_tech = list(TECH_MATERIAL = 3) + range = 0 + var/storage_added = 5 + equip_type = EQUIP_SPECIAL + +/obj/item/mecha_parts/mecha_equipment/storage/attach(obj/mecha/M) + . = ..() + M.cargo_capacity += storage_added + +/obj/item/mecha_parts/mecha_equipment/storage/detach() + chassis.cargo_capacity -= storage_added + ..() + +/obj/item/mecha_parts/mecha_equipment/storage/bluespace + name = "auxillary exosuit storage wormhole" + desc = "An auxillary storage wormhole, utilizing a localized rip in bluespace for storage. Interestingly enough, teleport-stable, \ + despite its blatant disregard for the fabric of reality or reality-adjacency." + icon_state = "mecha_phase_array" + storage_added = 15 + origin_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 4, TECH_MAGNET = 4, TECH_POWER = 5, TECH_BLUESPACE = 3) \ No newline at end of file diff --git a/code/game/objects/items/paintkit.dm b/code/game/objects/items/paintkit.dm index 45430a41c9..f172326fce 100644 --- a/code/game/objects/items/paintkit.dm +++ b/code/game/objects/items/paintkit.dm @@ -259,6 +259,17 @@ new_desc = "A very retro APLU unit; didn't they retire these back in 2543?" new_icon = "ripley-old" allowed_types = list("ripley") + var/showpilot = TRUE + var/showpilot_lift = 5 + +/obj/item/device/kit/paint/ripley/customize(obj/mecha/M, mob/user) + if(showpilot) + M.show_pilot = TRUE + M.pilot_lift = 5 + else + M.show_pilot = FALSE + M.pilot_lift = 0 + . = ..() /obj/item/device/kit/paint/ripley/death name = "\"Reaper\" APLU customisation kit" @@ -266,18 +277,21 @@ new_desc = "A terrifying, grim power loader. Why do those clamps have spikes?" new_icon = "deathripley" allowed_types = list("ripley","firefighter") + showpilot = FALSE /obj/item/device/kit/paint/ripley/flames_red name = "\"Firestarter\" APLU customisation kit" new_name = "APLU \"Firestarter\"" new_desc = "A standard APLU exosuit with stylish orange flame decals." new_icon = "ripley_flames_red" + showpilot = FALSE /obj/item/device/kit/paint/ripley/flames_blue name = "\"Burning Chrome\" APLU customisation kit" new_name = "APLU \"Burning Chrome\"" new_desc = "A standard APLU exosuit with stylish blue flame decals." new_icon = "ripley_flames_blue" + showpilot = FALSE // Durand kits. /obj/item/device/kit/paint/durand diff --git a/code/modules/research/mechfab_designs.dm b/code/modules/research/mechfab_designs.dm index d83b404a0b..7a053faaca 100644 --- a/code/modules/research/mechfab_designs.dm +++ b/code/modules/research/mechfab_designs.dm @@ -761,6 +761,22 @@ materials = list(MAT_STEEL = 10000, MAT_SILVER = 1000, MAT_GOLD = 1000) build_path = /obj/item/mecha_parts/mecha_equipment/speedboost +/datum/design/item/mecha/auxstorage + name = "Auxillary Exosuit Storage Bay" + desc = "An auxillary storage compartment, for attaching to exosuits." + id = "mech_storage" + req_tech = list(TECH_MATERIAL = 4) + materials = list(MAT_STEEL = 10000) + build_path = /obj/item/mecha_parts/mecha_equipment/storage + +/datum/design/item/mecha/bsauxstorage + name = "Auxillary Exosuit Storage Wormhole" + desc = "An auxillary storage wormhole, for attaching to exosuits." + id = "mech_storage" + req_tech = list(TECH_MATERIAL = 4) + materials = list(MAT_PLASTEEL = 10000, MAT_GRAPHITE = 8000, MAT_OSMIUM = 6000, MAT_PHORON = 6000, MAT_SILVER = 4000, MAT_GOLD = 4000) + build_path = /obj/item/mecha_parts/mecha_equipment/storage + /datum/design/item/synthetic_flash name = "Synthetic Flash" id = "sflash" diff --git a/icons/mecha/mecha_equipment_vr.dmi b/icons/mecha/mecha_equipment_vr.dmi index ec23292b9050e07ff1213cf078c53890ebbe91be..068953a893d6379409004f3c3e872211290a5257 100644 GIT binary patch literal 7277 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 literal 5194 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 Date: Thu, 3 Feb 2022 02:54:12 -0600 Subject: [PATCH 3/3] thanks unit tests --- code/modules/research/mechfab_designs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/research/mechfab_designs.dm b/code/modules/research/mechfab_designs.dm index 7a053faaca..82775d8bd9 100644 --- a/code/modules/research/mechfab_designs.dm +++ b/code/modules/research/mechfab_designs.dm @@ -772,10 +772,10 @@ /datum/design/item/mecha/bsauxstorage name = "Auxillary Exosuit Storage Wormhole" desc = "An auxillary storage wormhole, for attaching to exosuits." - id = "mech_storage" + id = "mech_storage_bs" req_tech = list(TECH_MATERIAL = 4) materials = list(MAT_PLASTEEL = 10000, MAT_GRAPHITE = 8000, MAT_OSMIUM = 6000, MAT_PHORON = 6000, MAT_SILVER = 4000, MAT_GOLD = 4000) - build_path = /obj/item/mecha_parts/mecha_equipment/storage + build_path = /obj/item/mecha_parts/mecha_equipment/storage/bluespace /datum/design/item/synthetic_flash name = "Synthetic Flash"