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 branch 'master' of https://github.com/tgstation/-tg-station into NODROP

Browse Source 
Conflicts:
	code/modules/mob/transform_procs.dm
This commit is contained in:
Miauw
2014-02-18 18:22:40 +01:00
parent 47dbc69280 2979aafa77
commit 3b24bb64f4
155 changed files with 2317 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,11 +45,15 @@
/obj/item/borg/sight/thermal
name = "\proper thermal vision"
sight_mode = BORGTHERM
icon = 'icons/obj/clothing/glasses.dmi'
icon_state = "thermal"
/obj/item/borg/sight/meson
name = "\proper meson vision"
sight_mode = BORGMESON
icon = 'icons/obj/clothing/glasses.dmi'
icon_state = "meson"
/obj/item/borg/sight/hud
@@ -59,6 +63,8 @@
/obj/item/borg/sight/hud/med
name = "medical hud"
icon = 'icons/obj/clothing/glasses.dmi'
icon_state = "healthhud"
New()
@@ -69,7 +75,8 @@
/obj/item/borg/sight/hud/sec
name = "security hud"
icon = 'icons/obj/clothing/glasses.dmi'
icon_state = "securityhud"
New()
..()