cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2014 from kyrahabattoir/ItemNameFixingRound3

Browse Source 
Item name fixing round3
This commit is contained in:
Cheridan
2013-12-26 23:14:15 -08:00
parent 7c2fbba76f df626a1f06
commit b9efeaa932
30 changed files with 109 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/game/objects/items/robot/robot_items.dm
View File

@@ -5,7 +5,7 @@
***********************************************************************/
//Might want to move this into several files later but for now it works here
/obj/item/borg/stun
name = "Electrified Arm"
name = "electrified arm"
icon = 'icons/obj/decals.dmi'
icon_state = "shock"
@@ -23,7 +23,7 @@
O.show_message("\red <B>[user] has prodded [M] with an electrically-charged arm!</B>", 1, "\red You hear someone fall", 2)
/obj/item/borg/overdrive
name = "Overdrive"
name = "overdrive"
icon = 'icons/obj/decals.dmi'
icon_state = "shock"
@@ -37,27 +37,27 @@
/obj/item/borg/sight/xray
name = "X-ray Vision"
name = "\proper x-ray Vision"
sight_mode = BORGXRAY
/obj/item/borg/sight/thermal
name = "Thermal Vision"
name = "\proper thermal vision"
sight_mode = BORGTHERM
/obj/item/borg/sight/meson
name = "Meson Vision"
name = "\proper meson vision"
sight_mode = BORGMESON
/obj/item/borg/sight/hud
name = "Hud"
name = "hud"
var/obj/item/clothing/glasses/hud/hud = null
/obj/item/borg/sight/hud/med
name = "Medical Hud"
name = "medical hud"
New()
@@ -67,7 +67,7 @@
/obj/item/borg/sight/hud/sec
name = "Security Hud"
name = "security hud"
New()

14
code/game/objects/items/robot/robot_parts.dm
View File

@@ -9,35 +9,35 @@
var/list/construction_cost = list("metal"=20000,"glass"=5000)
/obj/item/robot_parts/l_arm
name = "Cyborg Left Arm"
name = "cyborg left arm"
desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
icon_state = "l_arm"
construction_time = 200
construction_cost = list("metal"=18000)
/obj/item/robot_parts/r_arm
name = "Cyborg Right Arm"
name = "cyborg right arm"
desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
icon_state = "r_arm"
construction_time = 200
construction_cost = list("metal"=18000)
/obj/item/robot_parts/l_leg
name = "Cyborg Left Leg"
name = "cyborg left leg"
desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
icon_state = "l_leg"
construction_time = 200
construction_cost = list("metal"=15000)
/obj/item/robot_parts/r_leg
name = "Cyborg Right Leg"
name = "cyborg right leg"
desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
icon_state = "r_leg"
construction_time = 200
construction_cost = list("metal"=15000)
/obj/item/robot_parts/chest
name = "Cyborg Torso"
name = "cyborg torso"
desc = "A heavily reinforced case containing cyborg logic boards, with space for a standard power cell."
icon_state = "chest"
construction_time = 350
@@ -46,7 +46,7 @@
var/obj/item/weapon/cell/cell = null
/obj/item/robot_parts/head
name = "Cyborg Head"
name = "cyborg head"
desc = "A standard reinforced braincase, with spine-plugged neural socket and sensor gimbals."
icon_state = "head"
construction_time = 350
@@ -55,7 +55,7 @@
var/obj/item/device/flash/flash2 = null
/obj/item/robot_parts/robot_suit
name = "Cyborg Endoskeleton"
name = "cyborg endoskeleton"
desc = "A complex metal backbone with standard limb sockets and pseudomuscle anchors."
icon_state = "robo_suit"
construction_time = 500

8
code/game/objects/items/robot/robot_upgrades.dm
View File

@@ -2,7 +2,7 @@
// Contains various borg upgrades.
/obj/item/borg/upgrade
name = "A borg upgrade module."
name = "borg upgrade module."
desc = "Protected by FRM."
icon = 'icons/obj/module.dmi'
icon_state = "cyborg_upgrade"
@@ -78,7 +78,7 @@
/obj/item/borg/upgrade/vtec
name = "cyborg VTEC Module"
name = "cyborg VTEC module"
desc = "Used to kick in a cyborg's VTEC systems, increasing their speed."
construction_cost = list("metal"=80000 , "glass"=6000 , "gold"= 5000)
icon_state = "cyborg_upgrade2"
@@ -95,7 +95,7 @@
/obj/item/borg/upgrade/tasercooler
name = "cyborg Rapid Taser Cooling Module"
name = "cyborg rapid taser cooling module"
desc = "Used to cool a mounted taser, increasing the potential current in it and thus its recharge rate."
construction_cost = list("metal"=80000 , "glass"=6000 , "gold"= 2000, "diamond" = 500)
icon_state = "cyborg_upgrade3"
@@ -152,7 +152,7 @@
/obj/item/borg/upgrade/syndicate/
name = "Illegal Equipment Module"
name = "illegal equipment module"
desc = "Unlocks the hidden, deadlier functions of a cyborg"
construction_cost = list("metal"=10000,"glass"=15000,"diamond" = 10000)
icon_state = "cyborg_upgrade3"