cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-19 19:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into clean_steps

Browse Source
This commit is contained in:
kcin2001
2019-10-11 23:57:46 -07:00
committed by GitHub
parent 893767119e 3bceb23158
commit 402250b93a
4 changed files with 1314 additions and 1295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
+28 -10
View File
@@ -67,55 +67,72 @@
/obj/item/weapon/robot_module/robot/medical/surgeon //VOREStation sprites
vr_sprites = list(
"Acheron" = "mechoid-Medical"
"Acheron" = "mechoid-Medical",
"Gibbs" = "gibbs"
)
/obj/item/weapon/robot_module/robot/medical/crisis //VOREStation sprites
vr_sprites = list(
"Handy" = "handy-med",
"Acheron" = "mechoid-Medical"
"Acheron" = "mechoid-Medical",
"Gibbs" = "gibbs",
"Servbot" = "servbot-medi"
)
/obj/item/weapon/robot_module/robot/clerical/butler //VOREStation sprites
vr_sprites = list(
"Handy - Service" = "handy-service",
"Handy - Hydro" = "handy-hydro",
"Acheron" = "mechoid-Service"
"Acheron" = "mechoid-Service",
"Lloyd" = "lloyd",
"Servbot" = "servbot-service"
)
/obj/item/weapon/robot_module/robot/clerical/general //VOREStation sprites
vr_sprites = list(
"Handy" = "handy-clerk",
"Acheron" = "mechoid-Service"
"Acheron" = "mechoid-Service",
"Servbot - Service" = "servbot-service"
)
/obj/item/weapon/robot_module/robot/janitor //VOREStation sprites
vr_sprites = list(
"Handy" = "handy-janitor",
"Acheron" = "mechoid-Janitor"
"Acheron" = "mechoid-Janitor",
"Flynn" = "flynn",
"Han-d" = "han-d",
"Servbot" = "servbot-jani"
)
/obj/item/weapon/robot_module/robot/security/general //VOREStation sprites
vr_sprites = list(
"Handy" = "handy-sec",
"Acheron" = "mechoid-Security"
"Acheron" = "mechoid-Security",
"Woody" = "woody",
"Servbot" = "servbot-sec"
)
/obj/item/weapon/robot_module/robot/miner //VOREStation sprites
vr_sprites = list(
"Handy" = "handy-miner",
"Acheron" = "mechoid-Miner"
"Acheron" = "mechoid-Miner",
"Ishimura" = "ishimura",
"Servbot" = "servbot-miner"
)
/obj/item/weapon/robot_module/robot/standard //VOREStation sprites
vr_sprites = list(
"Handy" = "handy-standard",
"Acheron" = "mechoid-Standard"
"Acheron" = "mechoid-Standard",
"Durin" = "durin",
"Servbot" = "servbot"
)
/obj/item/weapon/robot_module/robot/engineering/general //VOREStation sprites
vr_sprites = list(
"Acheron" = "mechoid-Engineering"
"Acheron" = "mechoid-Engineering",
"Conagher" = "conagher",
"Servbot" = "servbot-engi"
)
/obj/item/weapon/robot_module/robot/research //VOREStation sprites
@@ -125,7 +142,8 @@
/obj/item/weapon/robot_module/robot/security/combat //VOREStation sprites
vr_sprites = list(
"Acheron" = "mechoid-Combat"
"Acheron" = "mechoid-Combat",
"Servbot" = "servbot-combat"
)
/obj/item/weapon/robot_module/robot/knine
code/modules/mob/living/simple_animal/vore/metroidsSimple.dm
+1286 -1285
View File
File diff suppressed because it is too large Load Diff