cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

code/game/objects/items/robot/* lowercase pass

Browse Source 
NOTE: vision modes have to be proper.

Conflicts:
	code/game/objects/items/robot/robot_parts.dm
	code/game/objects/items/robot/robot_upgrades.dm
This commit is contained in:
Kyrah Abattoir
2013-11-23 23:41:21 +01:00
committed by Mloc-Argent
parent 691e15bb2f
commit 2f0a0243e9
2 changed files with 10 additions and 10 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 //Might want to move this into several files later but for now it works here
/obj/item/borg/stun /obj/item/borg/stun
name = "Electrified Arm" name = "electrified arm"
icon = 'icons/obj/decals.dmi' icon = 'icons/obj/decals.dmi'
icon_state = "shock" icon_state = "shock"
@@ -26,7 +26,7 @@
O.show_message("\red <B>[user] has prodded [M] with an electrically-charged arm!</B>", 1, "\red You hear someone fall", 2) 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 /obj/item/borg/overdrive
name = "Overdrive" name = "overdrive"
icon = 'icons/obj/decals.dmi' icon = 'icons/obj/decals.dmi'
icon_state = "shock" icon_state = "shock"
@@ -40,27 +40,27 @@
/obj/item/borg/sight/xray /obj/item/borg/sight/xray
name = "X-ray Vision" name = "\proper x-ray Vision"
sight_mode = BORGXRAY sight_mode = BORGXRAY
/obj/item/borg/sight/thermal /obj/item/borg/sight/thermal
name = "Thermal Vision" name = "\proper thermal vision"
sight_mode = BORGTHERM sight_mode = BORGTHERM
/obj/item/borg/sight/meson /obj/item/borg/sight/meson
name = "Meson Vision" name = "\proper meson vision"
sight_mode = BORGMESON sight_mode = BORGMESON
/obj/item/borg/sight/hud /obj/item/borg/sight/hud
name = "Hud" name = "hud"
var/obj/item/clothing/glasses/hud/hud = null var/obj/item/clothing/glasses/hud/hud = null
/obj/item/borg/sight/hud/med /obj/item/borg/sight/hud/med
name = "Medical Hud" name = "medical hud"
New() New()
@@ -70,7 +70,7 @@
/obj/item/borg/sight/hud/sec /obj/item/borg/sight/hud/sec
name = "Security Hud" name = "security hud"
New() New()

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

@@ -2,7 +2,7 @@
// Contains various borg upgrades. // Contains various borg upgrades.
/obj/item/borg/upgrade /obj/item/borg/upgrade
name = "A borg upgrade module." name = "borg upgrade module."
desc = "Protected by FRM." desc = "Protected by FRM."
icon = 'icons/obj/module.dmi' icon = 'icons/obj/module.dmi'
icon_state = "cyborg_upgrade" icon_state = "cyborg_upgrade"
@@ -153,7 +153,7 @@
/obj/item/borg/upgrade/syndicate/ /obj/item/borg/upgrade/syndicate/
name = "Illegal Equipment Module" name = "illegal equipment module"
desc = "Unlocks the hidden, deadlier functions of a robot" desc = "Unlocks the hidden, deadlier functions of a robot"
construction_cost = list("metal"=10000,"glass"=15000,"diamond" = 10000) construction_cost = list("metal"=10000,"glass"=15000,"diamond" = 10000)
icon_state = "cyborg_upgrade3" icon_state = "cyborg_upgrade3"