mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-30 12:02:24 +00:00
Fixes the Mech RFD (#7626)
It didn't work, now it does. Better at least. Also gave the mounted extinguisher a non-default name.
This commit is contained in:
@@ -234,7 +234,6 @@ RFD Construction-Class
|
||||
/obj/item/rfd/construction/borg/can_use(var/mob/user,var/turf/T)
|
||||
return (user.Adjacent(T) && !user.stat)
|
||||
|
||||
|
||||
/obj/item/rfd/construction/mounted/useResource(var/amount, var/mob/user)
|
||||
var/cost = amount*130 //so that a rig with default powercell can build ~2.5x the stuff a fully-loaded RFD-C can.
|
||||
if(istype(loc,/obj/item/rig_module))
|
||||
@@ -243,6 +242,11 @@ RFD Construction-Class
|
||||
if(module.holder.cell.charge >= cost)
|
||||
module.holder.cell.use(cost)
|
||||
return 1
|
||||
else if(istype(user, /mob/living/heavy_vehicle))
|
||||
var/obj/item/cell/c = user.get_cell()
|
||||
if(c && c.charge >= cost)
|
||||
c.use(cost)
|
||||
return 1
|
||||
return 0
|
||||
|
||||
/obj/item/rfd/construction/mounted/attackby()
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
/obj/item/mecha_equipment/mounted_system/rfd
|
||||
name = "mounted rfd"
|
||||
icon_state = "mecha_rfd"
|
||||
holding_type = /obj/item/rfd/construction/borg
|
||||
holding_type = /obj/item/rfd/construction/mounted
|
||||
restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND)
|
||||
restricted_software = list(MECH_SOFTWARE_ENGINEERING)
|
||||
|
||||
/obj/item/rfd/construction/borg/get_hardpoint_maptext()
|
||||
/obj/item/rfd/construction/mounted/get_hardpoint_maptext()
|
||||
var/obj/item/mecha_equipment/mounted_system/MS = loc
|
||||
if(istype(MS) && MS.owner)
|
||||
var/obj/item/cell/C = MS.owner.get_cell()
|
||||
@@ -13,7 +13,7 @@
|
||||
return "[round(C.charge)]/[round(C.maxcharge)]"
|
||||
return null
|
||||
|
||||
/obj/item/rfd/construction/borg/get_hardpoint_status_value()
|
||||
/obj/item/rfd/construction/mounted/get_hardpoint_status_value()
|
||||
var/obj/item/mecha_equipment/mounted_system/MS = loc
|
||||
if(istype(MS) && MS.owner)
|
||||
var/obj/item/cell/C = MS.owner.get_cell()
|
||||
@@ -25,6 +25,7 @@
|
||||
name = "mounted fire extinguisher"
|
||||
max_water = 4000 //Good is gooder
|
||||
icon_state = "mecha_exting"
|
||||
safety = FALSE
|
||||
|
||||
/obj/item/extinguisher/mech/New()
|
||||
reagents = new/datum/reagents(max_water)
|
||||
@@ -39,6 +40,7 @@
|
||||
return reagents.total_volume/max_water
|
||||
|
||||
/obj/item/mecha_equipment/mounted_system/extinguisher
|
||||
name = "mounted extinguisher"
|
||||
icon_state = "mecha_exting"
|
||||
holding_type = /obj/item/extinguisher/mech
|
||||
restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND)
|
||||
|
||||
4
html/changelogs/Ferner-191207-bugfix_mechrfd.yml
Normal file
4
html/changelogs/Ferner-191207-bugfix_mechrfd.yml
Normal file
@@ -0,0 +1,4 @@
|
||||
author: Ferner
|
||||
delete-after: True
|
||||
changes:
|
||||
- bugfix: "Fixed the mech rfd, and the extinguisher will now have a proper name."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
Reference in New Issue
Block a user