Spacing issues fixed

This commit is contained in:
TDSSS
2018-10-11 09:12:52 +02:00
parent a2b73fcf31
commit f205c03ea7
5 changed files with 18 additions and 20 deletions
+3 -3
View File
@@ -1151,9 +1151,9 @@ var/global/list/common_tools = list(
return 0
/proc/ispowertool(O)//used to check if a tool can force powered doors
if(istype(O, /obj/item/crowbar/power) || istype(O, /obj/item/mecha_parts/mecha_equipment/medical/rescue_jaw/))
return 1
return 0
if(istype(O, /obj/item/crowbar/power) || istype(O, /obj/item/mecha_parts/mecha_equipment/medical/rescue_jaw))
return TRUE
return FALSE
/proc/iswire(O)
if(istype(O, /obj/item/stack/cable_coil))
@@ -524,7 +524,7 @@
name = "rescue jaw"
desc = "Emergency rescue jaws, designed to help first responders reach their patients. Opens doors and removes obstacles."
icon_state = "mecha_clamp" //can work, might use a blue resprite later but I think it works for now
origin_tech = "engineering=4;biotech=3"
origin_tech = "materials=2;engineering=2" //kind of sad, but identical to jaws of life
equip_cooldown = 15
energy_drain = 10
var/dam_force = 20
@@ -533,8 +533,8 @@
/obj/item/mecha_parts/mecha_equipment/medical/rescue_jaw/action(atom/target)
if(!action_checks(target))
return
if(istype(target,/obj))
if(!istype(target , /obj/machinery/door))//early return if we're not trying to open a door
if(istype(target, /obj))
if(!istype(target, /obj/machinery/door))//early return if we're not trying to open a door
return
var/obj/machinery/door/D = target //the door we want to open
D.try_to_crowbar(src, chassis.occupant)//use the door's crowbar function
@@ -544,13 +544,13 @@
target.visible_message("[chassis] gently boops [target] on the nose, its hydraulics hissing as safety overrides slow a brutal punch down at the last second.", \
"[chassis] gently boops [target] on the nose, its hydraulics hissing as safety overrides slow a brutal punch down at the last second.")
else
step_away(M,chassis)//out of the way, I have people to save!
step_away(M, chassis)//out of the way, I have people to save!
occupant_message("You gently push [target] out of the way.")
chassis.visible_message("[chassis] gently pushes [target] out of the way.")
/obj/item/mecha_parts/mecha_equipment/medical/rescue_jaw/can_attach(obj/mecha/M)
if(istype(M, /obj/mecha/medical) || istype(M, /obj/mecha/working/ripley/firefighter)) //Odys or firefighters
if(M.equipment.len<M.max_equip)
return 1
return 0
if(M.equipment.len < M.max_equip)
return TRUE
return FALSE
+2 -2
View File
@@ -41,7 +41,7 @@
var/datum/effect_system/spark_spread/spark_system = new
var/lights = 0
var/lights_power = 6
var/emagged = 0
var/emagged = FALSE
//inner atmos
var/use_internal_tank = 0
@@ -852,7 +852,7 @@
/obj/mecha/emag_act(mob/user)
to_chat(user, "<span class='warning'>The [src]'s ID slot rejects the card.</span>")
to_chat(user, "<span class='warning'>[src]'s ID slot rejects the card.</span>")
return
+4 -5
View File
@@ -183,11 +183,10 @@
drill.equip_cooldown = initial(drill.equip_cooldown)
/obj/mecha/working/ripley/emag_act(mob/user)
if(emagged == 0)
emagged = 1
to_chat(user, "<span class='notice'>You slide the card through the [src]'s ID slot.</span>")
if(!emagged)
emagged = TRUE
to_chat(user, "<span class='notice'>You slide the card through [src]'s ID slot.</span>")
playsound(loc, "sparks", 100, 1)
desc += "</br><span class='danger'>The mech's equipment slots spark dangerously!</span>"
else
to_chat(user, "<span class='warning'>The [src]'s ID slot rejects the card.</span>")
return
to_chat(user, "<span class='warning'>[src]'s ID slot rejects the card.</span>")
@@ -657,9 +657,8 @@
name = "Exosuit Medical Equipment (Rescue Jaw)"
id = "mech_medical_jaw"
build_type = MECHFAB
req_tech = list("biotech" = 4, "engineering" = 4)
build_path = /obj/item/mecha_parts/mecha_equipment/medical/rescue_jaw
materials = list(MAT_METAL=5000,MAT_GLASS=2000,MAT_DIAMOND=1500)
req_tech = list("materials" = 4, "engineering" = 6, "magnets" = 6) //now same as jaws of life
materials = list(MAT_METAL=5000,MAT_SILVER=2000,MAT_TITANIUM=1500)
construction_time = 200
category = list("Exosuit Equipment")