diff --git a/code/datums/uplink/devices and tools.dm b/code/datums/uplink/devices and tools.dm index 11658258dc1..0cea4c54aad 100644 --- a/code/datums/uplink/devices and tools.dm +++ b/code/datums/uplink/devices and tools.dm @@ -138,8 +138,3 @@ path = /obj/item/device/suit_cooling_unit/improved desc = "A suit cooling unit with a high capacity power cell." -/datum/uplink_item/item/tools/rig_cooling_unit - name = "mounted suit cooling unit" - item_cost = 8 - path = /obj/item/rig_module/cooling_unit - desc = "A mounted suit cooling unit for use with rigs." \ No newline at end of file diff --git a/code/datums/uplink/hardsuit_modules.dm b/code/datums/uplink/hardsuit_modules.dm index 74c8f4457d7..4fe47590043 100644 --- a/code/datums/uplink/hardsuit_modules.dm +++ b/code/datums/uplink/hardsuit_modules.dm @@ -38,3 +38,9 @@ name = "Mounted Laser Cannon" item_cost = 16 path = /obj/item/rig_module/mounted + +/datum/uplink_item/item/tools/rig_cooling_unit + name = "mounted suit cooling unit" + item_cost = 8 + path = /obj/item/rig_module/cooling_unit + desc = "A mounted suit cooling unit for use with hardsuits." \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm index 265ed37c7ca..8324d18f9a5 100644 --- a/code/modules/clothing/spacesuits/rig/modules/computer.dm +++ b/code/modules/clothing/spacesuits/rig/modules/computer.dm @@ -450,7 +450,7 @@ playsound(H.loc, 'sound/effects/sparks2.ogg', 50, 1) if(!holder.cell) - to_chat(H, "Your power sink flashes an error; there is no cell in your rig.") + to_chat(H, "Your power sink flashes an error; there is no cell in your hardsuit.") drain_complete(H) return @@ -460,7 +460,7 @@ return if(holder.cell.fully_charged()) - to_chat(H, "Your power sink flashes an amber light; your rig cell is full.") + to_chat(H, "Your power sink flashes an amber light; your hardsuit cell is full.") drain_complete(H) return diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm index 2d533f102e3..10b638ae52f 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm @@ -443,7 +443,7 @@ deactivate_string = "Deactivate Thrusters" interface_name = "maneuvering jets" - interface_desc = "An inbuilt EVA maneuvering system that runs off the rig air supply." + interface_desc = "An inbuilt EVA maneuvering system that runs off the hardsuit air supply." var/obj/item/weapon/tank/jetpack/rig/jets diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index 9b434b5d0e2..db8e9099654 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -1,6 +1,6 @@ /obj/item/weapon/rig/unathi name = "NT breacher chassis control module" - desc = "A cheap NT knock-off of an Unathi battle-rig. Looks like a fish, moves like a fish, steers like a cow." + desc = "A cheap NT knock-off of an Unathi battle-hardsuit. Looks like a fish, moves like a fish, steers like a cow." suit_type = "NT breacher" icon_state = "breacher_rig_cheap" armor = list(melee = 60, bullet = 60, laser = 60, energy = 60, bomb = 70, bio = 100, rad = 50) diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm index 1f31609907a..e17c27fee17 100644 --- a/code/modules/clothing/spacesuits/rig/suits/light.dm +++ b/code/modules/clothing/spacesuits/rig/suits/light.dm @@ -1,7 +1,7 @@ // Light rigs are not space-capable, but don't suffer excessive slowdown or sight issues when depowered. /obj/item/weapon/rig/light name = "light suit control module" - desc = "A lighter, less armoured rig suit." + desc = "A lighter, less armoured hardsuit." icon_state = "ninja_rig" suit_type = "light suit" allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/cell) diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index bb3979ef725..940e0b69627 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -25,7 +25,7 @@ desc = "Prepare for paperwork." icon_state = "internalaffairs_rig" armor = null - siemens_coefficient = 0.9 + siemens_coefficient = 0.9 slowdown = 0 offline_slowdown = 0 offline_vision_restriction = TINT_HEAVY @@ -60,7 +60,7 @@ /obj/item/weapon/rig/industrial name = "industrial suit control module" suit_type = "industrial hardsuit" - desc = "A heavy, powerful rig used by construction crews and mining corporations." + desc = "A heavy, powerful hardsuit used by construction crews and mining corporations." icon_state = "industrial_rig" armor = list(melee = 60, bullet = 40, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 50) siemens_coefficient = 0.35 @@ -96,7 +96,7 @@ /obj/item/weapon/rig/eva name = "EVA suit control module" suit_type = "EVA hardsuit" - desc = "A light rig for repairs and maintenance to the outside of habitats and vessels." + desc = "A light hardsuit for repairs and maintenance to the outside of habitats and vessels." icon_state = "eva_rig" armor = list(melee = 30, bullet = 10, laser = 20, energy = 25, bomb = 20, bio = 100, rad = 100) slowdown = 0 @@ -266,7 +266,7 @@ /obj/item/weapon/rig/diving name = "diving suit control module" suit_type = "diving suit" - desc = "A heavy rig designated for operations under the water, you are not sure what it is doing here however." + desc = "A heavy hardsuit designated for operations under the water, you are not sure what it is doing here however." icon_state = "diving_rig" armor = list(melee = 30, bullet = 10, laser = 20, energy = 25, bomb = 20, bio = 100, rad = 100) slowdown = 3 diff --git a/code/modules/mining/machine_rigpress.dm b/code/modules/mining/machine_rigpress.dm index 7e6d7af00e7..bf279e9904e 100644 --- a/code/modules/mining/machine_rigpress.dm +++ b/code/modules/mining/machine_rigpress.dm @@ -1,6 +1,6 @@ /obj/machinery/mineral/rigpress - name = "RIG module press" - desc = "This machine converts certain items permanently into RIG modules." + name = "hardsuit module press" + desc = "This machine converts certain items permanently into hardsuit modules." icon = 'icons/obj/stationobjs.dmi' icon_state = "coinpress0" density = 1 diff --git a/html/changelogs/alberyk-rigthing.yml b/html/changelogs/alberyk-rigthing.yml new file mode 100644 index 00000000000..083d7e70a5a --- /dev/null +++ b/html/changelogs/alberyk-rigthing.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - tweak: "Replace in game references about rig with hardsuit, to make things more consistent." \ No newline at end of file