diff --git a/code/WorkInProgress/mining.dm b/code/WorkInProgress/mining.dm index fbced8e8d60..ff0900494f0 100644 --- a/code/WorkInProgress/mining.dm +++ b/code/WorkInProgress/mining.dm @@ -2558,7 +2558,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( icon_state = "jackhammer" item_state = "jackhammer" digspeed = 30 - origin_tech = "materials=3; powerstorage=2" + origin_tech = "materials=3;powerstorage=2" desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards." drill @@ -2566,7 +2566,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( icon_state = "handdrill" item_state = "jackhammer" digspeed = 30 - origin_tech = "materials=3; powerstorage=2" + origin_tech = "materials=3;powerstorage=2" desc = "Yours is the drill that will pierce through the rock walls." gold @@ -2584,7 +2584,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( w_class = 3.0 //it is smaller than the pickaxe force = 10.0 //Also, weaker digspeed = 20 - origin_tech = "materials=4; plasmatech=2" + origin_tech = "materials=4;plasmatech=2" desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff." diamond @@ -2600,7 +2600,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( icon_state = "diamonddrill" item_state = "jackhammer" digspeed = 0 - origin_tech = "materials=6; powerstorage=4" + origin_tech = "materials=6;powerstorage=4" desc = "Yours is the drill that will pierce the heavens!" /*****************************Shovel********************************/ diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index 549328907a4..c7c0c49c95c 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -337,7 +337,7 @@ /proc/lightsout(isEvent = 0, lightsoutAmount = 1,lightsoutRange = 25) //leave lightsoutAmount as 0 to break ALL lights if(isEvent) - command_alert("In order to help fight Space Global Warming and conserve power, the lighting will be deactivated in some areas. Thank you for your understanding.","Budget Cuts Alert") + command_alert("An Electrical storm has been detected in your area, please repair potential electronic overloads.","Electrical Storm Alert") if(lightsoutAmount) var/list/epicentreList = list() diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 5f6a08d8c68..bb0ccde6077 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -25,7 +25,7 @@ GETLINEEEEEEEEEEEEEEEEEEEEE var/obj/item/device/igniter/part3 = null var/obj/item/weapon/tank/plasma/part4 = null m_amt = 500 - origin_tech = "combat=1; plasmatech=1" + origin_tech = "combat=1;plasmatech=1" // PantsNote: Dumping this shit in here until I'm sure it works. diff --git a/code/game/research/designs.dm b/code/game/research/designs.dm index efe2bdcb462..5a66f57793f 100644 --- a/code/game/research/designs.dm +++ b/code/game/research/designs.dm @@ -920,7 +920,7 @@ datum jackhammer name = "Sonic Jackhammer" desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards." - id = "pick_jackhammer" + id = "jackhammer" req_tech = list("materials" = 3, "powerstorage" = 2) build_type = PROTOLATHE materials = list("$metal" = 2000, "$glass" = 500, "$silver" = 500) @@ -930,7 +930,7 @@ datum drill name = "Mining Drill" desc = "Yours is the drill that will pierce through the rock walls." - id = "pick_jackhammer" + id = "drill" req_tech = list("materials" = 3, "powerstorage" = 2) build_type = PROTOLATHE materials = list("$metal" = 6000, "$glass" = 1000) //expensive, but no need for miners. @@ -940,7 +940,7 @@ datum plasmacutter name = "Plasma Cutter" desc = "You could use it to cut limbs off of xenos! Or, you know, mine stuff." - id = "pick_plasmacutter" + id = "plasmacutter" req_tech = list("materials" = 4, "plasmatech" = 2) build_type = PROTOLATHE materials = list("$metal" = 1500, "$glass" = 500, "$gold" = 500, "$plasma" = 500)