upload files
This commit is contained in:
@@ -176,6 +176,11 @@
|
|||||||
scheduled_destruction = world.time + (lifespan - CHAT_MESSAGE_EOL_FADE)
|
scheduled_destruction = world.time + (lifespan - CHAT_MESSAGE_EOL_FADE)
|
||||||
enter_subsystem()
|
enter_subsystem()
|
||||||
|
|
||||||
|
var/mob/living/silicon/robot/R = target
|
||||||
|
if(iscyborg(R))
|
||||||
|
if(R.module.dogborg == TRUE || R.dogborg == TRUE) //I hate whoever that thought that putting two types of dogborg that don't even sync up properly was good
|
||||||
|
message.pixel_x = 16
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Applies final animations to overlay CHAT_MESSAGE_EOL_FADE deciseconds prior to message deletion
|
* Applies final animations to overlay CHAT_MESSAGE_EOL_FADE deciseconds prior to message deletion
|
||||||
* Arguments:
|
* Arguments:
|
||||||
|
|||||||
@@ -231,8 +231,11 @@
|
|||||||
R.update_module_innate()
|
R.update_module_innate()
|
||||||
RM.rebuild_modules()
|
RM.rebuild_modules()
|
||||||
INVOKE_ASYNC(RM, .proc/do_transform_animation)
|
INVOKE_ASYNC(RM, .proc/do_transform_animation)
|
||||||
if(RM.dogborg)
|
if(RM.dogborg || R.dogborg)
|
||||||
RM.dogborg_equip()
|
RM.dogborg_equip()
|
||||||
|
R.typing_indicator_state = /obj/effect/overlay/typing_indicator/machine/dogborg
|
||||||
|
else
|
||||||
|
R.typing_indicator_state = /obj/effect/overlay/typing_indicator/machine
|
||||||
R.maxHealth = borghealth
|
R.maxHealth = borghealth
|
||||||
R.health = min(borghealth, R.health)
|
R.health = min(borghealth, R.health)
|
||||||
qdel(src)
|
qdel(src)
|
||||||
|
|||||||
@@ -48,6 +48,8 @@
|
|||||||
var/hack_software = FALSE //Will be able to use hacking actions
|
var/hack_software = FALSE //Will be able to use hacking actions
|
||||||
var/interaction_range = 7 //wireless control range
|
var/interaction_range = 7 //wireless control range
|
||||||
|
|
||||||
|
typing_indicator_state = /obj/effect/overlay/typing_indicator/machine
|
||||||
|
|
||||||
/mob/living/silicon/Initialize()
|
/mob/living/silicon/Initialize()
|
||||||
. = ..()
|
. = ..()
|
||||||
GLOB.silicon_mobs += src
|
GLOB.silicon_mobs += src
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
var/Discipline = 0 // if a slime has been hit with a freeze gun, or wrestled/attacked off a human, they become disciplined and don't attack anymore for a while
|
var/Discipline = 0 // if a slime has been hit with a freeze gun, or wrestled/attacked off a human, they become disciplined and don't attack anymore for a while
|
||||||
var/SStun = 0 // stun variable
|
var/SStun = 0 // stun variable
|
||||||
|
|
||||||
|
typing_indicator_state = /obj/effect/overlay/typing_indicator/slime
|
||||||
|
|
||||||
/mob/living/simple_animal/slime/BiologicalLife(seconds, times_fired)
|
/mob/living/simple_animal/slime/BiologicalLife(seconds, times_fired)
|
||||||
if(!(. = ..()))
|
if(!(. = ..()))
|
||||||
|
|||||||
@@ -55,3 +55,12 @@ GLOBAL_LIST_EMPTY(typing_indicator_overlays)
|
|||||||
icon_state = "normal_typing"
|
icon_state = "normal_typing"
|
||||||
appearance_flags = RESET_COLOR | TILE_BOUND | PIXEL_SCALE
|
appearance_flags = RESET_COLOR | TILE_BOUND | PIXEL_SCALE
|
||||||
layer = ABOVE_FLY_LAYER
|
layer = ABOVE_FLY_LAYER
|
||||||
|
|
||||||
|
/obj/effect/overlay/typing_indicator/machine
|
||||||
|
icon_state = "machine_typing"
|
||||||
|
|
||||||
|
/obj/effect/overlay/typing_indicator/machine/dogborg
|
||||||
|
icon = 'icons/mob/talk_64x64.dmi'
|
||||||
|
|
||||||
|
/obj/effect/overlay/typing_indicator/slime
|
||||||
|
icon_state = "slime_typing"
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 756 B |
Reference in New Issue
Block a user