Ports dogborg sprites from RP to main
Includes sit sprites, rest style verb, changing where sit sprites update in robot update_icons so that eye layers get cut properly when resting, etc.
This commit is contained in:
@@ -108,6 +108,9 @@
|
|||||||
buckle_lying = FALSE
|
buckle_lying = FALSE
|
||||||
var/static/list/can_ride_typecache = typecacheof(/mob/living/carbon/human)
|
var/static/list/can_ride_typecache = typecacheof(/mob/living/carbon/human)
|
||||||
|
|
||||||
|
var/sitting = 0
|
||||||
|
var/bellyup = 0
|
||||||
|
|
||||||
/mob/living/silicon/robot/get_cell()
|
/mob/living/silicon/robot/get_cell()
|
||||||
return cell
|
return cell
|
||||||
|
|
||||||
@@ -173,6 +176,7 @@
|
|||||||
diag_hud_set_borgcell()
|
diag_hud_set_borgcell()
|
||||||
|
|
||||||
verbs += /mob/living/proc/lay_down //CITADEL EDIT gimmie rest verb kthx
|
verbs += /mob/living/proc/lay_down //CITADEL EDIT gimmie rest verb kthx
|
||||||
|
verbs += /mob/living/silicon/robot/proc/rest_style
|
||||||
|
|
||||||
//If there's an MMI in the robot, have it ejected when the mob goes away. --NEO
|
//If there's an MMI in the robot, have it ejected when the mob goes away. --NEO
|
||||||
/mob/living/silicon/robot/Destroy()
|
/mob/living/silicon/robot/Destroy()
|
||||||
@@ -657,13 +661,6 @@
|
|||||||
add_overlay("[module.sleeper_overlay]_g[sleeper_nv ? "_nv" : ""]")
|
add_overlay("[module.sleeper_overlay]_g[sleeper_nv ? "_nv" : ""]")
|
||||||
if(sleeper_r && module.sleeper_overlay)
|
if(sleeper_r && module.sleeper_overlay)
|
||||||
add_overlay("[module.sleeper_overlay]_r[sleeper_nv ? "_nv" : ""]")
|
add_overlay("[module.sleeper_overlay]_r[sleeper_nv ? "_nv" : ""]")
|
||||||
if(module.dogborg == TRUE)
|
|
||||||
if(resting)
|
|
||||||
cut_overlays()
|
|
||||||
icon_state = "[module.cyborg_base_icon]-rest"
|
|
||||||
else
|
|
||||||
icon_state = "[module.cyborg_base_icon]"
|
|
||||||
|
|
||||||
if(stat == DEAD && module.has_snowflake_deadsprite)
|
if(stat == DEAD && module.has_snowflake_deadsprite)
|
||||||
icon_state = "[module.cyborg_base_icon]-wreck"
|
icon_state = "[module.cyborg_base_icon]-wreck"
|
||||||
|
|
||||||
@@ -697,6 +694,18 @@
|
|||||||
add_overlay(head_overlay)
|
add_overlay(head_overlay)
|
||||||
update_fire()
|
update_fire()
|
||||||
|
|
||||||
|
if(module.dogborg == TRUE)
|
||||||
|
if(resting)
|
||||||
|
if(sitting)
|
||||||
|
icon_state = "[module.cyborg_base_icon]-sit"
|
||||||
|
if(bellyup)
|
||||||
|
icon_state = "[module.cyborg_base_icon]-bellyup"
|
||||||
|
else if(!sitting && !bellyup)
|
||||||
|
icon_state = "[module.cyborg_base_icon]-rest"
|
||||||
|
cut_overlays()
|
||||||
|
else
|
||||||
|
icon_state = "[module.cyborg_base_icon]"
|
||||||
|
|
||||||
/mob/living/silicon/robot/proc/self_destruct()
|
/mob/living/silicon/robot/proc/self_destruct()
|
||||||
if(emagged)
|
if(emagged)
|
||||||
if(mmi)
|
if(mmi)
|
||||||
@@ -1242,3 +1251,19 @@
|
|||||||
connected_ai.aicamera.stored[i] = TRUE
|
connected_ai.aicamera.stored[i] = TRUE
|
||||||
for(var/i in connected_ai.aicamera.stored)
|
for(var/i in connected_ai.aicamera.stored)
|
||||||
aicamera.stored[i] = TRUE
|
aicamera.stored[i] = TRUE
|
||||||
|
|
||||||
|
/mob/living/silicon/robot/proc/rest_style()
|
||||||
|
set name = "Switch Rest Style"
|
||||||
|
set category = "Robot Commands"
|
||||||
|
set desc = "Select your resting pose."
|
||||||
|
sitting = 0
|
||||||
|
bellyup = 0
|
||||||
|
var/choice = alert(src, "Select resting pose", "", "Resting", "Sitting", "Belly up")
|
||||||
|
switch(choice)
|
||||||
|
if("Resting")
|
||||||
|
return 0
|
||||||
|
if("Sitting")
|
||||||
|
sitting = 1
|
||||||
|
if("Belly up")
|
||||||
|
bellyup = 1
|
||||||
|
update_icons()
|
||||||
@@ -10,7 +10,7 @@ mob/living/silicon
|
|||||||
|
|
||||||
/mob/living/silicon/robot/update_canmove()
|
/mob/living/silicon/robot/update_canmove()
|
||||||
..()
|
..()
|
||||||
if(client && stat != DEAD && dogborg == TRUE)
|
if(client && stat != DEAD && dogborg == FALSE)
|
||||||
if(resting)
|
if(resting)
|
||||||
cut_overlays()
|
cut_overlays()
|
||||||
icon_state = "[module.cyborg_base_icon]-rest"
|
icon_state = "[module.cyborg_base_icon]-rest"
|
||||||
@@ -18,6 +18,9 @@ mob/living/silicon
|
|||||||
icon_state = "[module.cyborg_base_icon]"
|
icon_state = "[module.cyborg_base_icon]"
|
||||||
update_icons()
|
update_icons()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/mob/living/silicon/robot/adjustStaminaLossBuffered(amount, updating_stamina = 1)
|
/mob/living/silicon/robot/adjustStaminaLossBuffered(amount, updating_stamina = 1)
|
||||||
if(istype(cell))
|
if(istype(cell))
|
||||||
cell.charge -= amount*5
|
cell.charge -= amount*5
|
||||||
|
|||||||
@@ -61,7 +61,7 @@
|
|||||||
|
|
||||||
/obj/item/robot_module/k9/be_transformed_to(obj/item/robot_module/old_module)
|
/obj/item/robot_module/k9/be_transformed_to(obj/item/robot_module/old_module)
|
||||||
var/mob/living/silicon/robot/R = loc
|
var/mob/living/silicon/robot/R = loc
|
||||||
var/list/sechoundmodels = list("Default")
|
var/list/sechoundmodels = list("Default", "Dark", "Vale")
|
||||||
if(R.client && R.client.ckey in list("nezuli"))
|
if(R.client && R.client.ckey in list("nezuli"))
|
||||||
sechoundmodels += "Alina"
|
sechoundmodels += "Alina"
|
||||||
var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in sechoundmodels
|
var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in sechoundmodels
|
||||||
@@ -70,11 +70,14 @@
|
|||||||
switch(borg_icon)
|
switch(borg_icon)
|
||||||
if("Default")
|
if("Default")
|
||||||
cyborg_base_icon = "k9"
|
cyborg_base_icon = "k9"
|
||||||
moduleselect_icon = "k9"
|
|
||||||
if("Alina")
|
if("Alina")
|
||||||
cyborg_base_icon = "alina-sec"
|
cyborg_base_icon = "alina-sec"
|
||||||
special_light_key = "alina"
|
special_light_key = "alina"
|
||||||
sleeper_overlay = "alinasleeper"
|
sleeper_overlay = "alinasleeper"
|
||||||
|
if("Dark")
|
||||||
|
cyborg_base_icon = "k9dark"
|
||||||
|
if("Vale")
|
||||||
|
cyborg_base_icon = "valesec"
|
||||||
return ..()
|
return ..()
|
||||||
|
|
||||||
/obj/item/robot_module/medihound
|
/obj/item/robot_module/medihound
|
||||||
@@ -109,7 +112,7 @@
|
|||||||
|
|
||||||
/obj/item/robot_module/medihound/be_transformed_to(obj/item/robot_module/old_module)
|
/obj/item/robot_module/medihound/be_transformed_to(obj/item/robot_module/old_module)
|
||||||
var/mob/living/silicon/robot/R = loc
|
var/mob/living/silicon/robot/R = loc
|
||||||
var/list/medhoundmodels = list("Default", "Dark")
|
var/list/medhoundmodels = list("Default", "Dark", "Vale")
|
||||||
if(R.client && R.client.ckey in list("nezuli"))
|
if(R.client && R.client.ckey in list("nezuli"))
|
||||||
medhoundmodels += "Alina"
|
medhoundmodels += "Alina"
|
||||||
var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in medhoundmodels
|
var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in medhoundmodels
|
||||||
@@ -121,6 +124,9 @@
|
|||||||
if("Dark")
|
if("Dark")
|
||||||
cyborg_base_icon = "medihounddark"
|
cyborg_base_icon = "medihounddark"
|
||||||
sleeper_overlay = "mdsleeper"
|
sleeper_overlay = "mdsleeper"
|
||||||
|
if("Vale")
|
||||||
|
cyborg_base_icon = "valemed"
|
||||||
|
sleeper_overlay = "valemedsleeper"
|
||||||
if("Alina")
|
if("Alina")
|
||||||
cyborg_base_icon = "alina-med"
|
cyborg_base_icon = "alina-med"
|
||||||
special_light_key = "alina"
|
special_light_key = "alina"
|
||||||
@@ -313,7 +319,7 @@
|
|||||||
|
|
||||||
/obj/item/robot_module/butler/be_transformed_to(obj/item/robot_module/old_module)
|
/obj/item/robot_module/butler/be_transformed_to(obj/item/robot_module/old_module)
|
||||||
var/mob/living/silicon/robot/R = loc
|
var/mob/living/silicon/robot/R = loc
|
||||||
var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Waitress", "Heavy", "Sleek", "Butler", "Tophat", "Kent", "Bro")
|
var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Waitress", "Heavy", "Sleek", "Butler", "Tophat", "Kent", "Bro", "DarkK9", "Vale", "ValeDark")
|
||||||
if(!borg_icon)
|
if(!borg_icon)
|
||||||
return FALSE
|
return FALSE
|
||||||
switch(borg_icon)
|
switch(borg_icon)
|
||||||
@@ -339,11 +345,32 @@
|
|||||||
cyborg_base_icon = "heavyserv"
|
cyborg_base_icon = "heavyserv"
|
||||||
special_light_key = "heavyserv"
|
special_light_key = "heavyserv"
|
||||||
cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
|
cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
|
||||||
|
if("DarkK9")
|
||||||
|
cyborg_base_icon = "k50"
|
||||||
|
special_light_key = "k50"
|
||||||
|
cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
|
||||||
|
has_snowflake_deadsprite = TRUE
|
||||||
|
dogborg = TRUE
|
||||||
|
cyborg_pixel_offset = -16
|
||||||
|
if("Vale")
|
||||||
|
cyborg_base_icon = "valeserv"
|
||||||
|
special_light_key = "valeserv"
|
||||||
|
cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
|
||||||
|
has_snowflake_deadsprite = TRUE
|
||||||
|
dogborg = TRUE
|
||||||
|
cyborg_pixel_offset = -16
|
||||||
|
if("ValeDark")
|
||||||
|
cyborg_base_icon = "valeservdark"
|
||||||
|
special_light_key = "valeservdark"
|
||||||
|
cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
|
||||||
|
has_snowflake_deadsprite = TRUE
|
||||||
|
dogborg = TRUE
|
||||||
|
cyborg_pixel_offset = -16
|
||||||
return ..()
|
return ..()
|
||||||
|
|
||||||
/obj/item/robot_module/engineering/be_transformed_to(obj/item/robot_module/old_module)
|
/obj/item/robot_module/engineering/be_transformed_to(obj/item/robot_module/old_module)
|
||||||
var/mob/living/silicon/robot/R = loc
|
var/mob/living/silicon/robot/R = loc
|
||||||
var/list/engymodels = list("Default", "Default - Treads", "Heavy", "Sleek", "Marina", "Can", "Spider", "Loader","Handy", "Pup Dozer")
|
var/list/engymodels = list("Default", "Default - Treads", "Heavy", "Sleek", "Marina", "Can", "Spider", "Loader","Handy", "Pup Dozer", "Vale")
|
||||||
if(R.client && R.client.ckey in list("nezuli"))
|
if(R.client && R.client.ckey in list("nezuli"))
|
||||||
engymodels += "Alina"
|
engymodels += "Alina"
|
||||||
var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in engymodels
|
var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in engymodels
|
||||||
@@ -386,6 +413,14 @@
|
|||||||
has_snowflake_deadsprite = TRUE
|
has_snowflake_deadsprite = TRUE
|
||||||
dogborg = TRUE
|
dogborg = TRUE
|
||||||
cyborg_pixel_offset = -16
|
cyborg_pixel_offset = -16
|
||||||
|
if("Vale")
|
||||||
|
cyborg_base_icon = "valeeng"
|
||||||
|
can_be_pushed = FALSE
|
||||||
|
hat_offset = INFINITY
|
||||||
|
cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
|
||||||
|
has_snowflake_deadsprite = TRUE
|
||||||
|
dogborg = TRUE
|
||||||
|
cyborg_pixel_offset = -16
|
||||||
if("Alina")
|
if("Alina")
|
||||||
cyborg_base_icon = "alina-eng"
|
cyborg_base_icon = "alina-eng"
|
||||||
special_light_key = "alina"
|
special_light_key = "alina"
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 342 KiB After Width: | Height: | Size: 634 KiB |
Reference in New Issue
Block a user