diff --git a/code/datums/uplink/exosuit_equipment.dm b/code/datums/uplink/exosuit_equipment.dm index 4424e7f61f5..fb009c1c0b4 100644 --- a/code/datums/uplink/exosuit_equipment.dm +++ b/code/datums/uplink/exosuit_equipment.dm @@ -7,31 +7,31 @@ name = "Mounted Electrolaser Carbine" desc = "A dual fire mode electrolaser system connected to the exosuit's targetting system." item_cost = 4 - path = /obj/item/mecha_equipment/mounted_system/taser + path = /obj/item/mecha_equipment/mounted_system/combat/taser /datum/uplink_item/item/exosuit_equipment/mounted_gun/ion name = "Mounted Ion Rifle" desc = "An exosuit-mounted ion rifle. Handle with care." item_cost = 12 - path = /obj/item/mecha_equipment/mounted_system/taser/ion + path = /obj/item/mecha_equipment/mounted_system/combat/ion /datum/uplink_item/item/exosuit_equipment/mounted_gun/laser name = "Mounted Laser Rifle" desc = "An exosuit-mounted laser rifle. Handle with care." item_cost = 8 - path = /obj/item/mecha_equipment/mounted_system/taser/laser + path = /obj/item/mecha_equipment/mounted_system/combat/laser /datum/uplink_item/item/exosuit_equipment/mounted_gun/smg name = "Mounted Machine Gun" desc = "An exosuit-mounted automatic weapon. Handle with care." item_cost = 8 - path = /obj/item/mecha_equipment/mounted_system/taser/smg + path = /obj/item/mecha_equipment/mounted_system/combat/smg /datum/uplink_item/item/exosuit_equipment/mounted_launcher name = "Mounted Missile Rack" desc = "An SRM-8 missile rack loaded with explosive missiles." item_cost = 20 - path = /obj/item/mecha_equipment/mounted_system/missile + path = /obj/item/mecha_equipment/mounted_system/combat/missile // UTILITY // diff --git a/code/modules/heavy_vehicle/_mech_setup.dm b/code/modules/heavy_vehicle/_mech_setup.dm index 61794e87f9f..0e870814e52 100644 --- a/code/modules/heavy_vehicle/_mech_setup.dm +++ b/code/modules/heavy_vehicle/_mech_setup.dm @@ -14,8 +14,7 @@ var/global/list/mecha_damage_overlay_cache = list() // No software required: taser. light, radio. #define MECH_SOFTWARE_UTILITY "utility equipment" // Plasma torch, clamp, drill. #define MECH_SOFTWARE_MEDICAL "medical support systems" // Sleeper. -#define MECH_SOFTWARE_WEAPONS "ballistic weapon systems" // Ballistics. -#define MECH_SOFTWARE_ADVWEAPONS "advanced weapon systems" // Railguns, ion rifle, missile launcher. +#define MECH_SOFTWARE_WEAPONS "exosuit weapon systems" // Combat equipment #define MECH_SOFTWARE_CULT "daemon systems" // Souljavelin, Doomblade #define MECH_SOFTWARE_ENGINEERING "advanced engineering systems" // RCD. diff --git a/code/modules/heavy_vehicle/components/software.dm b/code/modules/heavy_vehicle/components/software.dm index c0b6fb7b418..891fa32df81 100644 --- a/code/modules/heavy_vehicle/components/software.dm +++ b/code/modules/heavy_vehicle/components/software.dm @@ -31,10 +31,4 @@ icon_state = "mainboard" origin_tech = list(TECH_DATA = 4, TECH_COMBAT = 3) -/obj/item/circuitboard/exosystem/advweapons - name = T_BOARD_MECHA("advanced weapon systems") - contains_software = list(MECH_SOFTWARE_ADVWEAPONS) - icon_state = "mainboard" - origin_tech = list(TECH_DATA = 4, TECH_COMBAT = 5) - #undef T_BOARD_MECHA \ No newline at end of file diff --git a/code/modules/heavy_vehicle/equipment/combat.dm b/code/modules/heavy_vehicle/equipment/combat.dm index 3d53326f98c..50c0fe6d56a 100644 --- a/code/modules/heavy_vehicle/equipment/combat.dm +++ b/code/modules/heavy_vehicle/equipment/combat.dm @@ -1,63 +1,62 @@ /*Energy Guns*/ -/obj/item/mecha_equipment/mounted_system/taser +/obj/item/mecha_equipment/mounted_system/combat + name = "combat thing" + desc = "You shouldn't be seeing this." + icon_state = "mecha_taser" + restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND, HARDPOINT_LEFT_SHOULDER, HARDPOINT_RIGHT_SHOULDER) + restricted_software = list(MECH_SOFTWARE_WEAPONS) + +/obj/item/mecha_equipment/mounted_system/combat/taser name = "mounted electrolaser carbine" desc = "A dual fire mode electrolaser system connected to the exosuit's targetting system." icon_state = "mecha_taser" holding_type = /obj/item/gun/energy/taser/mounted/mech - restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND, HARDPOINT_LEFT_SHOULDER, HARDPOINT_RIGHT_SHOULDER) - restricted_software = list(MECH_SOFTWARE_WEAPONS) -/obj/item/mecha_equipment/mounted_system/taser/ion +/obj/item/mecha_equipment/mounted_system/combat/ion name = "mounted ion rifle" desc = "An exosuit-mounted ion rifle. Handle with care." icon_state = "mecha_ion" holding_type = /obj/item/gun/energy/rifle/ionrifle/mounted/mech -/obj/item/mecha_equipment/mounted_system/taser/laser +/obj/item/mecha_equipment/mounted_system/combat/laser name = "\improper CH-PS \"Immolator\" laser" desc = "An exosuit-mounted laser rifle. Handle with care." icon_state = "mecha_laser" restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND) holding_type = /obj/item/gun/energy/laser/mounted/mech -/obj/item/mecha_equipment/mounted_system/taser/smg +/obj/item/mecha_equipment/mounted_system/combat/smg name = "mounted machinegun" desc = "An exosuit-mounted automatic weapon. Handle with care." icon_state = "mecha_ballistic" holding_type = /obj/item/gun/energy/mountedsmg -/obj/item/mecha_equipment/mounted_system/pulse +/obj/item/mecha_equipment/mounted_system/combat/pulse name = "heavy pulse cannon" desc = "A weapon for combat exosuits. The eZ-13 mk2 heavy pulse rifle shoots powerful pulse-based beams, capable of destroying structures." icon_state = "pulse" holding_type = /obj/item/gun/energy/pulse/mounted/mech - restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND, HARDPOINT_LEFT_SHOULDER, HARDPOINT_RIGHT_SHOULDER) - restricted_software = list(MECH_SOFTWARE_ADVWEAPONS) -/obj/item/mecha_equipment/mounted_system/xray +/obj/item/mecha_equipment/mounted_system/combat/xray name = "xray gun" desc = "A weapon for combat exosuits. Shoots armor penetrating xray beams." icon_state = "mecha_xray" holding_type = /obj/item/gun/energy/xray/mounted/mech - restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND, HARDPOINT_LEFT_SHOULDER, HARDPOINT_RIGHT_SHOULDER) - restricted_software = list(MECH_SOFTWARE_ADVWEAPONS) -/obj/item/mecha_equipment/mounted_system/blaster +/obj/item/mecha_equipment/mounted_system/combat/blaster name = "rapidfire blaster" desc = "A weapon for combat exosuits. Shoots armor penetrating blaster beams." icon_state = "mecha_blaster" holding_type = /obj/item/gun/energy/blaster/mounted/mech restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND) - restricted_software = list(MECH_SOFTWARE_WEAPONS) -/obj/item/mecha_equipment/mounted_system/gauss +/obj/item/mecha_equipment/mounted_system/combat/gauss name = "heavy gauss cannon" desc = "A weapon for combat exosuits. Shoots high explosive gauss propelled projectiles." icon_state = "mecha_gauss" holding_type = /obj/item/gun/energy/gauss/mounted/mech restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND) - restricted_software = list(MECH_SOFTWARE_WEAPONS) /obj/item/gun/energy/taser/mounted/mech use_external_power = TRUE @@ -86,45 +85,40 @@ /*Launchers*/ -/obj/item/mecha_equipment/mounted_system/missile +/obj/item/mecha_equipment/mounted_system/combat/missile name = "missile rack" desc = "The SRM-8 missile rack is loaded with explosive missiles." icon_state = "mech_missile_pod" holding_type = /obj/item/gun/launcher/mech/mountedrl restricted_hardpoints = list(HARDPOINT_BACK, HARDPOINT_LEFT_SHOULDER, HARDPOINT_RIGHT_SHOULDER) - restricted_software = list(MECH_SOFTWARE_ADVWEAPONS) -/obj/item/mecha_equipment/mounted_system/grenadefrag +/obj/item/mecha_equipment/mounted_system/combat/grenadefrag name = "frag grenade launcher" desc = "The SGL-6FR grenade launcher is designed to launch primed fragmentation grenades." icon_state = "mech_gl" holding_type = /obj/item/gun/launcher/mech/mountedgl restricted_hardpoints = list(HARDPOINT_LEFT_SHOULDER, HARDPOINT_RIGHT_SHOULDER) - restricted_software = list(MECH_SOFTWARE_ADVWEAPONS) -/obj/item/mecha_equipment/mounted_system/grenadeflash +/obj/item/mecha_equipment/mounted_system/combat/grenadeflash name = "flashbang launcher" desc = "The SGL-6FL grenade launcher is designated to launch primed flashbangs." icon_state = "mech_gl" holding_type = /obj/item/gun/launcher/mech/mountedgl/fl restricted_hardpoints = list(HARDPOINT_LEFT_SHOULDER, HARDPOINT_RIGHT_SHOULDER) - restricted_software = list(MECH_SOFTWARE_WEAPONS) -/obj/item/mecha_equipment/mounted_system/grenadetear +/obj/item/mecha_equipment/mounted_system/combat/grenadetear name = "teargas launcher" desc = "The SGL-6TGL grenade launcher is designated to launch primed teargas grenades." icon_state = "mech_gl" holding_type = /obj/item/gun/launcher/mech/mountedgl/tg restricted_hardpoints = list(HARDPOINT_LEFT_SHOULDER, HARDPOINT_RIGHT_SHOULDER) - restricted_software = list(MECH_SOFTWARE_WEAPONS) -/obj/item/mecha_equipment/mounted_system/grenadesmoke +/obj/item/mecha_equipment/mounted_system/combat/grenadesmoke name = "smoke grenade launcher" desc = "The SGL-6SGL grenade launcher is designated to launch primed smoke grenades." icon_state = "mech_gl" holding_type = /obj/item/gun/launcher/mech/mountedgl/sm restricted_hardpoints = list(HARDPOINT_LEFT_SHOULDER, HARDPOINT_RIGHT_SHOULDER) - restricted_software = list(MECH_SOFTWARE_WEAPONS) /obj/item/gun/launcher/mech name = "mounted mech launcher" diff --git a/code/modules/heavy_vehicle/premade/combat.dm b/code/modules/heavy_vehicle/premade/combat.dm index 1b2822ed623..6c2a639d53d 100644 --- a/code/modules/heavy_vehicle/premade/combat.dm +++ b/code/modules/heavy_vehicle/premade/combat.dm @@ -9,8 +9,8 @@ e_legs = /obj/item/mech_component/propulsion/combat e_color = COLOR_DARK_GUNMETAL - h_r_shoulder = /obj/item/mecha_equipment/mounted_system/taser/smg - h_l_shoulder = /obj/item/mecha_equipment/mounted_system/taser/smg + h_r_shoulder = /obj/item/mecha_equipment/mounted_system/combat/smg + h_l_shoulder = /obj/item/mecha_equipment/mounted_system/combat/smg /obj/item/mech_component/manipulators/combat name = "combat arms" @@ -48,8 +48,7 @@ /obj/item/mech_component/sensors/combat/prebuild() ..() software = new(src) - software.installed_software |= MECH_SOFTWARE_WEAPONS - software.installed_software |= MECH_SOFTWARE_ADVWEAPONS + software.installed_software = list(MECH_SOFTWARE_WEAPONS, MECH_SOFTWARE_UTILITY) /obj/item/mech_component/chassis/combat name = "sealed exosuit chassis" diff --git a/code/modules/heavy_vehicle/premade/heavy.dm b/code/modules/heavy_vehicle/premade/heavy.dm index cd83db551d7..c6782277b9c 100644 --- a/code/modules/heavy_vehicle/premade/heavy.dm +++ b/code/modules/heavy_vehicle/premade/heavy.dm @@ -9,8 +9,8 @@ e_legs = /obj/item/mech_component/propulsion/heavy e_color = COLOR_TITANIUM - h_l_hand = /obj/item/mecha_equipment/mounted_system/taser/laser - h_r_hand = /obj/item/mecha_equipment/mounted_system/taser/ion + h_l_hand = /obj/item/mecha_equipment/mounted_system/combat/laser + h_r_hand = /obj/item/mecha_equipment/mounted_system/combat/ion h_back = /obj/item/mecha_equipment/shield /obj/item/mech_component/manipulators/heavy @@ -45,7 +45,7 @@ /obj/item/mech_component/sensors/heavy/prebuild() ..() software = new(src) - software.installed_software = list(MECH_SOFTWARE_WEAPONS, MECH_SOFTWARE_ADVWEAPONS) + software.installed_software = list(MECH_SOFTWARE_WEAPONS, MECH_SOFTWARE_UTILITY) /obj/item/mech_component/chassis/heavy name = "reinforced exosuit chassis" diff --git a/code/modules/heavy_vehicle/premade/military.dm b/code/modules/heavy_vehicle/premade/military.dm index c64cbe0f152..ab3ec8e54c1 100644 --- a/code/modules/heavy_vehicle/premade/military.dm +++ b/code/modules/heavy_vehicle/premade/military.dm @@ -31,7 +31,7 @@ /obj/item/mech_component/sensors/superheavy/prebuild() ..() software = new(src) - software.installed_software = list(MECH_SOFTWARE_WEAPONS, MECH_SOFTWARE_ADVWEAPONS) + software.installed_software = list(MECH_SOFTWARE_WEAPONS, MECH_SOFTWARE_UTILITY) /obj/item/mech_component/chassis/superheavy name = "heavy-duty military chassis" @@ -60,5 +60,5 @@ e_legs = /obj/item/mech_component/propulsion/superheavy e_color = COLOR_DARK_GUNMETAL - h_r_shoulder = /obj/item/mecha_equipment/mounted_system/pulse - h_l_shoulder = /obj/item/mecha_equipment/mounted_system/pulse \ No newline at end of file + h_r_shoulder = /obj/item/mecha_equipment/mounted_system/combat/pulse + h_l_shoulder = /obj/item/mecha_equipment/mounted_system/combat/pulse \ No newline at end of file diff --git a/code/modules/heavy_vehicle/premade/powerloader.dm b/code/modules/heavy_vehicle/premade/powerloader.dm index 248bca4279f..55eb5f3fb40 100644 --- a/code/modules/heavy_vehicle/premade/powerloader.dm +++ b/code/modules/heavy_vehicle/premade/powerloader.dm @@ -137,10 +137,10 @@ e_legs = /obj/item/mech_component/propulsion/ripley e_color = COLOR_TCFL - h_l_shoulder = /obj/item/mecha_equipment/mounted_system/grenadesmoke + h_l_shoulder = /obj/item/mecha_equipment/mounted_system/combat/grenadesmoke h_r_shoulder = /obj/item/mecha_equipment/mounted_system/flarelauncher - h_l_hand = /obj/item/mecha_equipment/mounted_system/blaster - h_r_hand = /obj/item/mecha_equipment/mounted_system/gauss + h_l_hand = /obj/item/mecha_equipment/mounted_system/combat/blaster + h_r_hand = /obj/item/mecha_equipment/mounted_system/combat/gauss /mob/living/heavy_vehicle/premade/combatripley/Initialize() . = ..() diff --git a/code/modules/item_worth/worths_list.dm b/code/modules/item_worth/worths_list.dm index aeca3f4cfbd..3059e12d6af 100644 --- a/code/modules/item_worth/worths_list.dm +++ b/code/modules/item_worth/worths_list.dm @@ -637,10 +637,10 @@ var/list/worths = list( /obj/item/pipe = 100, /obj/item/pipe_meter = 300, /obj/item/mecha_equipment/catapult = 3000, - /obj/item/mecha_equipment/mounted_system/taser/laser = 2000, - /obj/item/mecha_equipment/mounted_system/taser/ion = 1550, - /obj/item/mecha_equipment/mounted_system/taser = 1000, - /obj/item/mecha_equipment/mounted_system/taser/smg = 5800, + /obj/item/mecha_equipment/mounted_system/combat/laser = 2000, + /obj/item/mecha_equipment/mounted_system/combat/ion = 1550, + /obj/item/mecha_equipment/mounted_system/combat/taser = 1000, + /obj/item/mecha_equipment/mounted_system/combat/smg = 5800, /obj/item/mecha_equipment = 1000, /obj/item/missile = 1200, /obj/item/blueprints = 4000, //Information is valuable, diff --git a/code/modules/research/designs/circuit/exosuit_circuits.dm b/code/modules/research/designs/circuit/exosuit_circuits.dm index f0a1c63316f..a2021e24b7b 100644 --- a/code/modules/research/designs/circuit/exosuit_circuits.dm +++ b/code/modules/research/designs/circuit/exosuit_circuits.dm @@ -31,9 +31,4 @@ /datum/design/circuit/exosuit/weapons name = "Basic Weapon Control" req_tech = list(TECH_DATA = 4) - build_path = /obj/item/circuitboard/exosystem/weapons - -/datum/design/circuit/exosuit/advweapons - name = "Advanced Weapon Control" - req_tech = list(TECH_DATA = 4) - build_path = /obj/item/circuitboard/exosystem/advweapons \ No newline at end of file + build_path = /obj/item/circuitboard/exosystem/weapons \ No newline at end of file diff --git a/code/modules/research/designs/mechfab/mechs/designs_exosuit_equipment.dm b/code/modules/research/designs/mechfab/mechs/designs_exosuit_equipment.dm index 9fc71f6f0b4..e37be761086 100644 --- a/code/modules/research/designs/mechfab/mechs/designs_exosuit_equipment.dm +++ b/code/modules/research/designs/mechfab/mechs/designs_exosuit_equipment.dm @@ -18,12 +18,12 @@ name = "Mounted Taser" materials = list(DEFAULT_WALL_MATERIAL = 10000) req_tech = list(TECH_COMBAT = 1) - build_path = /obj/item/mecha_equipment/mounted_system/taser + build_path = /obj/item/mecha_equipment/mounted_system/combat/taser /datum/design/item/mechfab/exosuit_equipment/uac name = "Mounted Automatic Weapon" req_tech = list(TECH_COMBAT = 4) - build_path = /obj/item/mecha_equipment/mounted_system/taser/smg + build_path = /obj/item/mecha_equipment/mounted_system/combat/smg /datum/design/item/mechfab/exosuit_equipment/plasma name = "Mounted Plasma Cutter" @@ -35,13 +35,13 @@ name = "Mounted Ion Rifle" materials = list(DEFAULT_WALL_MATERIAL = 10000) req_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 4) - build_path = /obj/item/mecha_equipment/mounted_system/taser/ion + build_path = /obj/item/mecha_equipment/mounted_system/combat/ion /datum/design/item/mechfab/exosuit_equipment/laser name = "Mounted Laser Gun" materials = list(DEFAULT_WALL_MATERIAL = 10000) req_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 4) - build_path = /obj/item/mecha_equipment/mounted_system/taser/laser + build_path = /obj/item/mecha_equipment/mounted_system/combat/laser /datum/design/item/mechfab/exosuit_equipment/rcd name = "Mounted RFD-C" @@ -69,13 +69,13 @@ /datum/design/item/mechfab/exosuit_equipment/xray name = "Mounted X-Ray Gun" req_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 4, TECH_MATERIAL = 5, TECH_ILLEGAL = 3) - build_path = /obj/item/mecha_equipment/mounted_system/xray + build_path = /obj/item/mecha_equipment/mounted_system/combat/xray materials = list(DEFAULT_WALL_MATERIAL = 20000, MATERIAL_GOLD = 6000, MATERIAL_PHORON = 6000) /datum/design/item/mechfab/exosuit_equipment/flashbang name = "Mounted Flashbang Launcher" req_tech = list(TECH_COMBAT = 3) - build_path = /obj/item/mecha_equipment/mounted_system/grenadeflash + build_path = /obj/item/mecha_equipment/mounted_system/combat/grenadeflash materials = list(DEFAULT_WALL_MATERIAL = 20000, MATERIAL_GOLD = 6000, MATERIAL_PHORON = 6000) /datum/design/item/mechfab/exosuit_equipment/cleaner diff --git a/html/changelogs/geeves-mecha_combat_repath.yml b/html/changelogs/geeves-mecha_combat_repath.yml new file mode 100644 index 00000000000..c63cb98f1b7 --- /dev/null +++ b/html/changelogs/geeves-mecha_combat_repath.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - rscdel: "Removed the advanced weapons software for exosuits, all combat gear now work with the standard weapon software." \ No newline at end of file