cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sidewinder tool tweaks (#18531)

Browse Source 
* e

xtinguisher

* extra bit i forgot

* cableau
This commit is contained in:
Mqiib
2023-04-15 16:53:05 -04:00
committed by GitHub
parent 9400bb64ee
commit b937f6c3b5
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/mecha/equipment/tools/work_tools.dm
View File

@@ -239,9 +239,9 @@
/obj/item/mecha_parts/mecha_equipment/extinguisher/get_equip_info() /obj/item/mecha_parts/mecha_equipment/extinguisher/get_equip_info()
return "[..()] \[[src.reagents.total_volume]\]" return "[..()] \[[src.reagents.total_volume]\]"
/obj/item/mecha_parts/mecha_equipment/extinguisher/can_attach(obj/mecha/working/M as obj) /obj/item/mecha_parts/mecha_equipment/extinguisher/can_attach(obj/mecha/M as obj)
if(..()) if(..())
if(istype(M)) if(istype(M, /obj/mecha/working) || istype(M, /obj/mecha/combat/sidewinder))
return 1 return 1
return 0 return 0
@@ -382,9 +382,9 @@
. = ..() . = ..()
cable = new(src, 0) cable = new(src, 0)
/obj/item/mecha_parts/mecha_equipment/cable_layer/can_attach(obj/mecha/working/M) /obj/item/mecha_parts/mecha_equipment/cable_layer/can_attach(obj/mecha/M)
if(..()) if(..())
if(istype(M)) if(istype(M, /obj/mecha/working) || istype(M, /obj/mecha/combat/sidewinder))
return 1 return 1
return 0 return 0

8
code/game/mecha/equipment/weapons/weapons.dm
View File

@@ -163,7 +163,9 @@
harmful = FALSE harmful = FALSE
/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma/can_attach(obj/mecha/M) /obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma/can_attach(obj/mecha/M)
if(..()) //combat mech if(M.melee_allowed && !M.guns_allowed) //Should only hold true for melee mechs
return 0
else if(..()) //combat mech
return 1 return 1
else if(M.equipment.len < M.max_equip && istype(M)) else if(M.equipment.len < M.max_equip && istype(M))
return 1 return 1
@@ -181,7 +183,9 @@
//attachable to all mechas, like the plasma cutter //attachable to all mechas, like the plasma cutter
/obj/item/mecha_parts/mecha_equipment/weapon/energy/mecha_kineticgun/can_attach(obj/mecha/M) /obj/item/mecha_parts/mecha_equipment/weapon/energy/mecha_kineticgun/can_attach(obj/mecha/M)
if(..()) //combat mech if(M.melee_allowed && !M.guns_allowed) //Should only hold true for melee mechs
return 0
else if(..()) //combat mech
return 1 return 1
else if(M.equipment.len < M.max_equip && istype(M)) else if(M.equipment.len < M.max_equip && istype(M))
return 1 return 1