From 9ec1400ae1344eba2b1effc8be6bce8ff06134c0 Mon Sep 17 00:00:00 2001 From: Markolie Date: Sun, 5 Mar 2017 23:04:41 +0100 Subject: [PATCH] Fix comments --- code/datums/wires/particle_accelerator.dm | 2 +- code/game/machinery/doors/airlock.dm | 2 +- code/game/objects/items/weapons/tools.dm | 1 + code/modules/research/designs/equipment_designs.dm | 4 ++-- code/modules/research/designs/medical_designs.dm | 12 ++++++------ 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/code/datums/wires/particle_accelerator.dm b/code/datums/wires/particle_accelerator.dm index d1e78dc2755..1ed68b799f4 100644 --- a/code/datums/wires/particle_accelerator.dm +++ b/code/datums/wires/particle_accelerator.dm @@ -16,7 +16,7 @@ var/const/PARTICLE_LIMIT_POWER_WIRE = 8 // Determines how strong the PA can be. return "Strength" if(PARTICLE_INTERFACE_WIRE) - return "Interfact" + return "Interface" if(PARTICLE_LIMIT_POWER_WIRE) return "Maximum Power" diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 66660f8b659..da82b73d353 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -875,7 +875,7 @@ About the new airlock wires panel: return else if(istype(C, /obj/item/weapon/crowbar/power)) if(isElectrified()) - shock(user, 100)//it's like sticking a forck in a power socket + shock(user, 100)//it's like sticking a fork in a power socket return if(!density)//already open diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 1816e6287e6..7d4a7e19bd8 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -588,6 +588,7 @@ light_intensity = 0 change_icons = 0 origin_tech = "plasmatech=5;engineering=5;abductor=3" + can_off_process = 1 /obj/item/weapon/weldingtool/abductor/process() if(get_fuel() <= max_fuel) diff --git a/code/modules/research/designs/equipment_designs.dm b/code/modules/research/designs/equipment_designs.dm index b0e895c3edb..bb5c126efd1 100644 --- a/code/modules/research/designs/equipment_designs.dm +++ b/code/modules/research/designs/equipment_designs.dm @@ -198,7 +198,7 @@ id = "handdrill" req_tech = list("materials" = 4, "engineering" = 6) build_type = PROTOLATHE - materials = list(MAT_METAL = 3500, MAT_SILVER = 1500, MAT_TITANIUM = 2500) + materials = list(MAT_METAL = 3500, MAT_SILVER = 1500, MAT_GOLD = 1000) build_path = /obj/item/weapon/screwdriver/power category = list("Equipment") @@ -209,7 +209,7 @@ req_tech = list("materials" = 4, "engineering" = 6, "magnets" = 6) // added one more requirment since the Jaws of Life are a bit OP build_path = /obj/item/weapon/crowbar/power build_type = PROTOLATHE - materials = list(MAT_METAL = 4500, MAT_SILVER = 2500, MAT_TITANIUM = 3500) + materials = list(MAT_METAL = 4500, MAT_SILVER = 2500, MAT_DIAMOND = 1000) category = list("Equipment") /datum/design/alienwrench diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 2e18a71cc0a..4955efd2535 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -206,7 +206,7 @@ req_tech = list("bio" = 4, "materials" = 4, "abductor" = 3) build_path = /obj/item/weapon/scalpel/alien build_type = PROTOLATHE - materials = list(MAT_METAL = 2000, MAT_SILVER = 1500, MAT_PLASMA = 500) + materials = list(MAT_METAL = 2000, MAT_SILVER = 1500, MAT_GOLD = 500, MAT_PLASMA = 500) category = list("Medical Designs") /datum/design/alienhemostat @@ -216,7 +216,7 @@ req_tech = list("bio" = 4, "materials" = 4, "abductor" = 3) build_path = /obj/item/weapon/hemostat/alien build_type = PROTOLATHE - materials = list(MAT_METAL = 2000, MAT_SILVER = 1500, MAT_PLASMA = 500) + materials = list(MAT_METAL = 2000, MAT_SILVER = 1500, MAT_GOLD = 500, MAT_PLASMA = 500) category = list("Medical Designs") /datum/design/alienretractor @@ -226,7 +226,7 @@ req_tech = list("bio" = 4, "materials" = 4, "abductor" = 3) build_path = /obj/item/weapon/retractor/alien build_type = PROTOLATHE - materials = list(MAT_METAL = 2000, MAT_SILVER = 1500, MAT_PLASMA = 500) + materials = list(MAT_METAL = 2000, MAT_SILVER = 1500, MAT_GOLD = 500, MAT_PLASMA = 500) category = list("Medical Designs") /datum/design/aliensaw @@ -236,7 +236,7 @@ req_tech = list("bio" = 4, "materials" = 4, "abductor" = 3) build_path = /obj/item/weapon/circular_saw/alien build_type = PROTOLATHE - materials = list(MAT_METAL = 10000, MAT_SILVER = 2500, MAT_PLASMA = 1000) + materials = list(MAT_METAL = 10000, MAT_SILVER = 2500, MAT_GOLD = 1000, MAT_PLASMA = 1000) category = list("Medical Designs") /datum/design/aliendrill @@ -246,7 +246,7 @@ req_tech = list("bio" = 4, "materials" = 4, "abductor" = 3) build_path = /obj/item/weapon/surgicaldrill/alien build_type = PROTOLATHE - materials = list(MAT_METAL = 10000, MAT_SILVER = 2500, MAT_PLASMA = 1000) + materials = list(MAT_METAL = 10000, MAT_SILVER = 2500, MAT_GOLD = 1000, MAT_PLASMA = 1000) category = list("Medical Designs") /datum/design/aliencautery @@ -256,7 +256,7 @@ req_tech = list("bio" = 4, "materials" = 4, "abductor" = 3) build_path = /obj/item/weapon/cautery/alien build_type = PROTOLATHE - materials = list(MAT_METAL = 2000, MAT_SILVER = 1500, MAT_PLASMA = 500) + materials = list(MAT_METAL = 2000, MAT_SILVER = 1500, MAT_GOLD = 500, MAT_PLASMA = 500) category = list("Medical Designs") /////////////////////////////////////////