Merge pull request #1621 from ProbablyCarl/dogborg_fixes

Borg QoL Material
This commit is contained in:
Dahlular
2022-05-17 04:28:05 -06:00
committed by GitHub
11 changed files with 115 additions and 21 deletions
@@ -10,6 +10,9 @@
/mob/living/silicon/robot/modules/borgi
set_module = /obj/item/robot_module/borgi
/mob/living/silicon/robot/modules/orepup
set_module = /obj/item/robot_module/orepup
/mob/living/silicon/robot/proc/get_cit_modules()
var/list/modulelist = list()
modulelist["MediHound"] = /obj/item/robot_module/medihound
@@ -17,6 +20,7 @@
modulelist["Security K-9"] = /obj/item/robot_module/k9
modulelist["Scrub Puppy"] = /obj/item/robot_module/scrubpup
modulelist["Borgi"] = /obj/item/robot_module/borgi
modulelist["Orepup"] = /obj/item/robot_module/orepup
return modulelist
/obj/item/robot_module
@@ -261,14 +265,13 @@
cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
has_snowflake_deadsprite = TRUE
/*
/obj/item/robot_module/orepup
name = "Ore Pup"
basic_modules = list(
/obj/item/storage/bag/ore/cyborg,
/obj/item/analyzer/nose,
/obj/item/storage/bag/borgdelivery,
/obj/item/dogborg/sleeper/ore,
/obj/item/dogborg/sleeper/compactor/ore,
/obj/item/pickaxe/drill/cyborg,
/obj/item/shovel,
/obj/item/crowbar/cyborg,
@@ -282,20 +285,33 @@
/obj/item/clockwork/slab/cyborg/miner,
/obj/item/clockwork/weapon/ratvarian_spear,
/obj/item/borg/sight/xray/truesight_lens)
cyborg_base_icon = "orepup"
moduleselect_icon = "orepup"
sleeper_overlay = "osleeper"
cyborg_base_icon = "blade"
moduleselect_icon = "miner"
sleeper_overlay = "bladesleeper"
cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
has_snowflake_deadsprite = TRUE
cyborg_pixel_offset = -16
/obj/item/robot_module/miner/do_transform_animation()
/obj/item/robot_module/orepup/be_transformed_to(obj/item/robot_module/old_module)
var/mob/living/silicon/robot/R = loc
R.cut_overlays()
R.setDir(SOUTH)
flick("orepup_transform", R)
do_transform_delay()
R.update_headlamp()
*/
var/static/list/orepup_models
if(!orepup_models)
orepup_models = list(
"blade" = image(icon = 'modular_citadel/icons/mob/widerobot.dmi', icon_state = "blade"),
"vale" = image(icon = 'modular_citadel/icons/mob/widerobot.dmi', icon_state = "valemine")
)
orepup_models = sortList(orepup_models)
var/orepup_borg_icon = show_radial_menu(R, R , orepup_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!orepup_borg_icon)
return
switch(orepup_borg_icon)
if("blade")
cyborg_base_icon = "blade"
if("vale")
cyborg_base_icon = "valemine"
sleeper_overlay = "valeminesleeper"
has_snowflake_deadsprite = TRUE
return ..()
/obj/item/robot_module/medical/be_transformed_to(obj/item/robot_module/old_module)
var/mob/living/silicon/robot/R = loc
@@ -353,7 +369,7 @@
cyborg_base_icon = "haydeemedical"
cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
hat_offset = 3
if("qualified_doctor")
cyborg_base_icon = "qualified_doctor"
cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'