shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hand drill, jaws of life, and emitter grammar tweaks

Browse Source
This commit is contained in:
CitadelStationBot
2017-06-16 15:19:22 -05:00
parent f659a0923e
commit 8a1a4dd671
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/tools.dm
+8 -8
View File
@@ -58,8 +58,8 @@
origin_tech = "materials=5;engineering=5;abductor=3" origin_tech = "materials=5;engineering=5;abductor=3"
/obj/item/weapon/wrench/power /obj/item/weapon/wrench/power
name = "Hand Drill" name = "hand drill"
desc ="A simple powered drill with a bolt bit" desc = "A simple powered hand drill. It's fitted with a bolt bit."
icon_state = "drill_bolt" icon_state = "drill_bolt"
item_state = "drill" item_state = "drill"
usesound = 'sound/items/drill_use.ogg' usesound = 'sound/items/drill_use.ogg'
@@ -182,8 +182,8 @@
toolspeed = 0.1 toolspeed = 0.1
/obj/item/weapon/screwdriver/power /obj/item/weapon/screwdriver/power
name = "Hand Drill" name = "hand drill"
desc = "A simple hand drill with a screwdriver bit attached." desc = "A simple powered hand drill. It's fitted with a screw bit."
icon_state = "drill_screw" icon_state = "drill_screw"
item_state = "drill" item_state = "drill"
materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25)
@@ -283,8 +283,8 @@
toolspeed = 0.5 toolspeed = 0.5
/obj/item/weapon/wirecutters/power /obj/item/weapon/wirecutters/power
name = "Jaws of Life" name = "jaws of life"
desc = "A set of jaws of life, the magic of science has managed to fit it down into a device small enough to fit in a tool belt. It's fitted with a cutting head." desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head."
icon_state = "jaws_cutter" icon_state = "jaws_cutter"
item_state = "jawsoflife" item_state = "jawsoflife"
origin_tech = "materials=2;engineering=2" origin_tech = "materials=2;engineering=2"
@@ -714,8 +714,8 @@
toolspeed = 0.5 toolspeed = 0.5
/obj/item/weapon/crowbar/power /obj/item/weapon/crowbar/power
name = "Jaws of Life" name = "jaws of life"
desc = "A set of jaws of life, the magic of science has managed to fit it down into a device small enough to fit in a tool belt. It's fitted with a prying head" desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head."
icon_state = "jaws_pry" icon_state = "jaws_pry"
item_state = "jawsoflife" item_state = "jawsoflife"
materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25)
code/modules/power/singularity/emitter.dm
+2 -2
View File
@@ -1,6 +1,6 @@
/obj/machinery/power/emitter /obj/machinery/power/emitter
name = "Emitter" name = "emitter"
desc = "A heavy duty industrial laser.\n<span class='notice'>Alt-click to rotate it clockwise.</span>" desc = "A heavy-duty industrial laser, often used in containment fields and power generation.\n<span class='notice'>Alt-click to rotate it clockwise.</span>"
icon = 'icons/obj/singularity.dmi' icon = 'icons/obj/singularity.dmi'
icon_state = "emitter" icon_state = "emitter"
var/icon_state_on = "emitter_+a" var/icon_state_on = "emitter_+a"