mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-20 19:44:46 +01:00
borgs can walk, vtec overhaul, no more borg light and some glow flicker (#15901)
* borgs can walk, no more borg light flicker * rework vtec * small oversight on glow * .
This commit is contained in:
@@ -403,7 +403,8 @@
|
||||
blob.rad_glow = CLAMP(radiation,0,250)
|
||||
set_light(0)
|
||||
blob.set_light(max(1,min(5,radiation/15)), max(1,min(10,radiation/25)), blob.color)
|
||||
blob.handle_light()
|
||||
else
|
||||
blob.set_light(0)
|
||||
if(has_hat)
|
||||
blob.hat = new_hat
|
||||
new_hat.forceMove(src)
|
||||
|
||||
@@ -370,8 +370,8 @@
|
||||
IgniteMob()
|
||||
|
||||
/mob/living/silicon/robot/handle_light()
|
||||
. = ..()
|
||||
if(. == FALSE) // If no other light sources are on.
|
||||
if(lights_on)
|
||||
set_light(integrated_light_power, 1, "#FFFFFF")
|
||||
return TRUE
|
||||
if(lights_on)
|
||||
set_light(integrated_light_power, 1, "#FFFFFF")
|
||||
return TRUE
|
||||
else
|
||||
. = ..()
|
||||
|
||||
@@ -117,6 +117,7 @@
|
||||
)
|
||||
|
||||
var/has_recoloured = FALSE
|
||||
var/vtec_active = FALSE
|
||||
|
||||
/mob/living/silicon/robot/New(loc, var/unfinished = 0)
|
||||
spark_system = new /datum/effect/effect/system/spark_spread()
|
||||
@@ -533,12 +534,9 @@
|
||||
/mob/living/silicon/robot/proc/toggle_vtec()
|
||||
set name = "Toggle VTEC"
|
||||
set category = "Abilities"
|
||||
if(speed == -1)
|
||||
to_chat(src, "<span class='filter_notice'>VTEC module disabled.</span>")
|
||||
speed = 0
|
||||
else
|
||||
to_chat(src, "<span class='filter_notice'>VTEC module enabled.</span>")
|
||||
speed = -1
|
||||
vtec_active = !vtec_active
|
||||
hud_used.toggle_vtec_control()
|
||||
to_chat(src, "<span class='filter_notice'>VTEC module [vtec_active ? "enabled" : "disabled"].</span>")
|
||||
|
||||
// update the status screen display
|
||||
/mob/living/silicon/robot/Stat()
|
||||
|
||||
@@ -88,6 +88,8 @@
|
||||
"rad" = 100
|
||||
)
|
||||
|
||||
glow_override = TRUE
|
||||
|
||||
/mob/living/simple_mob/vore/oregrub/lava
|
||||
name = "mature lavagrub"
|
||||
desc = "A mature, rocky lavagrub"
|
||||
@@ -141,6 +143,8 @@
|
||||
if(. == 0 && !is_dead())
|
||||
set_light(2.5, 1, COLOR_ORANGE)
|
||||
return 1
|
||||
else if(is_dead())
|
||||
glow_override = FALSE
|
||||
|
||||
/mob/living/simple_mob/vore/oregrub/lava/death()
|
||||
set_light(0)
|
||||
|
||||
@@ -242,20 +242,3 @@
|
||||
icon_state = "scel_red"
|
||||
icon_rest = "scel_red-rest"
|
||||
random_skin = 0
|
||||
|
||||
/mob/living/simple_mob/vore/scel/handle_light()
|
||||
if(glow_override)
|
||||
return FALSE
|
||||
|
||||
if(instability >= TECHNOMANCER_INSTABILITY_MIN_GLOW)
|
||||
var/distance = round(sqrt(instability / 2))
|
||||
if(distance)
|
||||
set_light(distance, distance * 4, l_color = "#660066")
|
||||
return TRUE
|
||||
|
||||
else if(glow_toggle)
|
||||
set_light(glow_range, glow_intensity, glow_color)
|
||||
|
||||
else
|
||||
set_light(0)
|
||||
return FALSE
|
||||
|
||||
@@ -53,6 +53,8 @@ List of things solar grubs should be able to do:
|
||||
var/shock_chance = 10 // Beware
|
||||
var/tracked = FALSE
|
||||
|
||||
glow_override = TRUE
|
||||
|
||||
/datum/say_list/solargrub
|
||||
emote_see = list("squelches", "squishes")
|
||||
|
||||
@@ -138,6 +140,8 @@ List of things solar grubs should be able to do:
|
||||
if(. == 0 && !is_dead())
|
||||
set_light(2.5, 1, COLOR_YELLOW)
|
||||
return 1
|
||||
else if(is_dead())
|
||||
glow_override = FALSE
|
||||
|
||||
/mob/living/simple_mob/vore/solargrub/init_vore()
|
||||
..()
|
||||
|
||||
@@ -51,6 +51,8 @@ var/global/list/grub_machine_overlays = list()
|
||||
|
||||
ai_holder_type = /datum/ai_holder/simple_mob/solargrub_larva
|
||||
|
||||
glow_override = TRUE
|
||||
|
||||
/mob/living/simple_mob/animal/solargrub_larva/New()
|
||||
..()
|
||||
existing_solargrubs += src
|
||||
@@ -186,6 +188,8 @@ var/global/list/grub_machine_overlays = list()
|
||||
if(. == 0 && !is_dead())
|
||||
set_light(1.5, 1, COLOR_YELLOW)
|
||||
return 1
|
||||
else if(is_dead())
|
||||
glow_override = FALSE
|
||||
|
||||
|
||||
/obj/machinery/abstract_grub_machine
|
||||
|
||||
Reference in New Issue
Block a user