cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rework MoMMI eye rendering. Should fix eyes acting weird.

Browse Source
This commit is contained in:
Rob Nelson
2014-05-22 13:23:08 -07:00
parent 1a70a23cd2
commit d27a56f32c
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
code/modules/mob/living/silicon/mommi/mommi.dm
View File

@@ -42,9 +42,10 @@ They can only use one tool at a time, they can't choose modules, and they have 1
cell = new /obj/item/weapon/cell(src)
cell.maxcharge = 15000
cell.charge = 15000
..()
..(loc,startup_sound='sound/misc/interference.ogg')
module = new /obj/item/weapon/robot_module/mommi(src)
laws = new mommi_base_law_type
// Don't sync if we're a KEEPER.
if(!istype(laws,/datum/ai_laws/keeper))
connected_ai = select_active_ai_with_fewest_borgs()
@@ -73,9 +74,6 @@ They can only use one tool at a time, they can't choose modules, and they have 1
if(connected_ai && keeper)
world << "\red ASSERT FAILURE: connected_ai && keeper in mommi.dm"
//playsound(loc, 'sound/voice/liveagain.ogg', 75, 1)
playsound(loc, 'sound/misc/interference.ogg', 75, 1)
/mob/living/silicon/robot/mommi/choose_icon()
var/icontype = input("Select an icon!", "Mobile MMI", null) in list("Basic", "Hover", "Keeper", "RepairBot", "Replicator")
@@ -401,16 +399,15 @@ They can only use one tool at a time, they can't choose modules, and they have 1
overlays += "ov-openpanel +c"
else
overlays += "ov-openpanel -c"
// Put our eyes just on top of the lighting, so it looks emissive in maint tunnels.
if(layer==MOB_LAYER)
overlays+=image(icon,"eyes-[subtype][emagged?"-emagged":""]",LIGHTING_LAYER+1)
if(anchored)
overlays+=image(icon,"[subtype]-park", LIGHTING_LAYER+1)
else
overlays+=image(icon,"eyes-[subtype][emagged?"-emagged":""]",TURF_LAYER+0.2) // Fixes floating eyes
if(anchored)
overlays+=image(icon,"[subtype]-park", TURF_LAYER+0.2)
return
var/overlay_layer = LIGHTING_LAYER+1
if(layer != MOB_LAYER)
overlay_layer=TURF_LAYER+0.2
overlays += image(icon,"eyes-[subtype][emagged?"-emagged":""]",overlay_layer)
if(anchored)
overlays += image(icon,"[subtype]-park",overlay_layer)

4
code/modules/mob/living/silicon/robot/robot.dm
View File

@@ -71,7 +71,7 @@
var/ioncheck[1]
/mob/living/silicon/robot/New(loc,var/syndie = 0,var/unfinished = 0)
/mob/living/silicon/robot/New(loc,var/syndie = 0,var/unfinished = 0,var/startup_sound='sound/voice/liveagain.ogg')
spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, src)
spark_system.attach(src)
@@ -136,7 +136,7 @@
cell_component.wrapped = cell
cell_component.installed = 1
playsound(loc, 'sound/voice/liveagain.ogg', 75, 1)
playsound(loc, startup_sound, 75, 1)
// setup the PDA and its name
/mob/living/silicon/robot/proc/setup_PDA()