cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-23 03:56:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3189 from Verkister/moreborgostuff

Browse Source 
Readies our borg stuff for next sync fixes.
This commit is contained in:
Aronai Sieyes
2018-03-10 15:01:04 -05:00
committed by GitHub
parent 2704811b63 f54383b995
commit 54cf9636ec
7 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
+14
View File
@@ -120,6 +120,7 @@
src.emag = new /obj/item/weapon/gun/energy/laser/mounted(src) //Emag. Not a big problem.
R.icon = 'icons/mob/widerobot_vr.dmi'
R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
R.ui_style_vr = TRUE
//R.icon_state = "k9"
R.pixel_x = -16
R.old_x = -16
@@ -173,6 +174,7 @@
src.emag = new /obj/item/weapon/dogborg/pounce(src) //Pounce
R.icon = 'icons/mob/widerobot_vr.dmi'
R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
R.ui_style_vr = TRUE
//R.icon_state = "medihound"
R.pixel_x = -16
R.old_x = -16
@@ -202,6 +204,7 @@
src.emag = new /obj/item/weapon/gun/energy/laser/mounted(src)
R.icon = 'icons/mob/64x64robot_vr.dmi'
R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
R.ui_style_vr = TRUE
R.pixel_x = -16
R.old_x = -16
R.default_pixel_x = -16
@@ -226,6 +229,7 @@
src.emag = new /obj/item/weapon/dogborg/pounce(src) //Pounce
R.icon = 'icons/mob/widerobot_vr.dmi'
R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
R.ui_style_vr = TRUE
//R.icon_state = "scrubpup"
R.pixel_x = -16
R.old_x = -16
@@ -260,6 +264,7 @@
src.emag = new /obj/item/weapon/hand_tele(src)
R.icon = 'icons/mob/widerobot_vr.dmi'
R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
R.ui_style_vr = TRUE
//R.icon_state = "science"
R.pixel_x = -16
R.old_x = -16
@@ -268,3 +273,12 @@
R.wideborg = TRUE
..()
/obj/item/weapon/robot_module/Reset(var/mob/living/silicon/robot/R)
R.pixel_x = initial(pixel_x)
R.pixel_y = initial(pixel_y)
R.icon = initial(R.icon)
R.dogborg = FALSE
R.wideborg = FALSE
R.ui_style_vr = FALSE
R.default_pixel_x = initial(pixel_x)
..()
code/modules/mob/living/silicon/robot/robot_vr.dm
+1
View File
@@ -8,6 +8,7 @@
var/dogborg = FALSE //Dogborg special features (overlays etc.)
var/wideborg = FALSE //When the borg simply doesn't use standard 32p size.
var/original_icon = 'icons/mob/robots.dmi'
var/ui_style_vr = FALSE //Do we use our hud icons?
var/vr_icons = list(
"handy-hydro",
"handy-service",