cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Touch stuff in reference to responses.

Browse Source
This commit is contained in:
Mechoid
2018-08-25 19:59:51 -07:00
parent 204b887ec9
commit a3fbf79c9e
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/mecha/equipment/mecha_equipment.dm
View File

@@ -19,7 +19,7 @@
var/salvageable = 1 var/salvageable = 1
var/required_type = /obj/mecha //may be either a type or a list of allowed types var/required_type = /obj/mecha //may be either a type or a list of allowed types
var/equip_type = null //mechaequip2 var/equip_type = null //mechaequip2
var/allow_duplicate = 0 var/allow_duplicate = FALSE
/obj/item/mecha_parts/mecha_equipment/proc/do_after_cooldown(target=1) /obj/item/mecha_parts/mecha_equipment/proc/do_after_cooldown(target=1)
sleep(equip_cooldown) sleep(equip_cooldown)
@@ -104,7 +104,7 @@
return 0 return 0
return 1 return 1
/obj/item/mecha_parts/mecha_equipment/proc/handle_movement_action() //Any modules that have special effects or needs when moving. /obj/item/mecha_parts/mecha_equipment/proc/handle_movement_action() //Any modules that have special effects or needs when taking a step or floating through space.
return return
/obj/item/mecha_parts/mecha_equipment/proc/action(atom/target) /obj/item/mecha_parts/mecha_equipment/proc/action(atom/target)

2
code/game/mecha/equipment/tools/medical_tools.dm
View File

@@ -12,7 +12,7 @@
var/inject_amount = 5 var/inject_amount = 5
required_type = /obj/mecha/medical required_type = /obj/mecha/medical
salvageable = 0 salvageable = 0
allow_duplicate = 1 allow_duplicate = TRUE
/obj/item/mecha_parts/mecha_equipment/tool/sleeper/New() /obj/item/mecha_parts/mecha_equipment/tool/sleeper/New()
..() ..()

4
code/game/mecha/equipment/tools/tools.dm
View File

@@ -866,7 +866,7 @@
/obj/item/mecha_parts/mecha_equipment/combat_shield/attach(obj/mecha/M as obj) /obj/item/mecha_parts/mecha_equipment/combat_shield/attach(obj/mecha/M as obj)
..() ..()
if(chassis) if(chassis)
my_shield.shield_health = my_shield.shield_health / 2 my_shield.shield_health = 0
my_shield.my_mecha = chassis my_shield.my_mecha = chassis
my_shield.forceMove(chassis) my_shield.forceMove(chassis)
@@ -1153,7 +1153,7 @@
var/mob/living/carbon/occupant = null var/mob/living/carbon/occupant = null
var/door_locked = 1 var/door_locked = 1
salvageable = 0 salvageable = 0
allow_duplicate = 1 allow_duplicate = TRUE
equip_type = EQUIP_HULL equip_type = EQUIP_HULL

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

@@ -166,7 +166,7 @@
description_fluff = "Essentially an Orion mounted inside a modified Gaia case." description_fluff = "Essentially an Orion mounted inside a modified Gaia case."
icon_state = "mecha_phase" icon_state = "mecha_phase"
energy_drain = 25 energy_drain = 25
projectile = /obj/item/projectile/energy/phase projectile = /obj/item/projectile/energy/phase/heavy
fire_sound = 'sound/weapons/Taser.ogg' fire_sound = 'sound/weapons/Taser.ogg'
equip_type = EQUIP_UTILITY equip_type = EQUIP_UTILITY