diff --git a/code/modules/mob/living/silicon/robot/sprites/civilian.dm b/code/modules/mob/living/silicon/robot/sprites/civilian.dm index 27d945ad92d..aba15c00b7a 100644 --- a/code/modules/mob/living/silicon/robot/sprites/civilian.dm +++ b/code/modules/mob/living/silicon/robot/sprites/civilian.dm @@ -331,6 +331,25 @@ has_vore_belly_sprites = FALSE rest_sprite_options = list("Default", "Bellyup") +/datum/robot_sprite/dogborg/tall/service_dullahan + module_type = "Service" + sprite_icon = 'icons/mob/dullahanborg/dullahan_serv.dmi' + +/datum/robot_sprite/dogborg/tall/service_dullahan/dullahanserv + name = "Dullahan" + sprite_icon_state = "dullahanserv" + has_eye_light_sprites = TRUE + has_custom_open_sprites = TRUE + has_vore_belly_sprites = TRUE + rest_sprite_options = list("Default", "Sit") + +/datum/robot_sprite/dogborg/tall/service_dullahan/dullahanserv_alt + name = "Dullahan alt" + sprite_icon_state = "dullahanserv_alt" + has_eye_light_sprites = TRUE + has_custom_open_sprites = TRUE + has_vore_belly_sprites = TRUE + rest_sprite_options = list("Default", "Sit") // Clerical @@ -416,4 +435,37 @@ sprite_icon = 'icons/mob/robot/clerical_large.dmi' // None yet -*/ \ No newline at end of file +*/ + + +//dullahan sprite stuff cont. + +/datum/robot_sprite/dogborg/tall/dullahanservicemodule + module_type = "Service" + sprite_icon = 'icons/mob/dullahanborg/dullahan_serv.dmi' + +/datum/robot_sprite/dogborg/tall/dullahanservicemodule/do_equipment_glamour(var/obj/item/weapon/robot_module/module) + if(!has_custom_equipment_sprites) + return + + ..() + + var/obj/item/device/dogborg/sleeper/compactor/brewer/DB = locate() in module.modules + if(DB) + DB.icon_state = "brewer" + +/datum/robot_sprite/dogborg/tall/dullahanservicemodule/dullahanservice + name = "Dullahan service" + sprite_icon_state = "dullahanserv" + has_eye_light_sprites = TRUE + has_custom_open_sprites = TRUE + has_vore_belly_sprites = TRUE + rest_sprite_options = list("Default", "Sit") + +/datum/robot_sprite/dogborg/tall/dullahanservicemodule/dullahanservicealt + name = "Dullahan service v2" + sprite_icon_state = "dullahanserv_alt" + has_eye_light_sprites = TRUE + has_custom_open_sprites = TRUE + has_vore_belly_sprites = TRUE + rest_sprite_options = list("Default", "Sit") diff --git a/code/modules/mob/living/silicon/robot/sprites/engineering.dm b/code/modules/mob/living/silicon/robot/sprites/engineering.dm index 7ed4d675443..e9d0f2e72cc 100644 --- a/code/modules/mob/living/silicon/robot/sprites/engineering.dm +++ b/code/modules/mob/living/silicon/robot/sprites/engineering.dm @@ -232,4 +232,37 @@ has_eye_light_sprites = TRUE has_custom_open_sprites = TRUE has_vore_belly_sprites = FALSE - rest_sprite_options = list("Default", "Bellyup") \ No newline at end of file + rest_sprite_options = list("Default", "Bellyup") + + +// dullahan sprite stuff cont. + +/datum/robot_sprite/dogborg/tall/dullahanengineeringmodule + module_type = "Engineering" + sprite_icon = 'icons/mob/dullahanborg/dullahan_eng.dmi' + +/datum/robot_sprite/dogborg/tall/dullahanengineeringmodule/do_equipment_glamour(var/obj/item/weapon/robot_module/module) + if(!has_custom_equipment_sprites) + return + + ..() + + var/obj/item/device/dogborg/sleeper/compactor/decompiler/DC = locate() in module.modules + if(DC) + DC.icon_state = "decompiler" + +/datum/robot_sprite/dogborg/tall/dullahanengineeringmodule/dullahanengineering + name = "Dullahan" + sprite_icon_state = "dullahaneng" + has_eye_light_sprites = TRUE + has_custom_open_sprites = TRUE + has_vore_belly_sprites = TRUE + rest_sprite_options = list("Default", "Sit") + +/datum/robot_sprite/dogborg/tall/dullahanengineeringmodule/dullahanengineeringalt + name = "Dullahan v2" + sprite_icon_state = "dullahaneng_alt" + has_eye_light_sprites = TRUE + has_custom_open_sprites = TRUE + has_vore_belly_sprites = TRUE + rest_sprite_options = list("Default", "Sit") diff --git a/code/modules/mob/living/silicon/robot/sprites/janitor.dm b/code/modules/mob/living/silicon/robot/sprites/janitor.dm index 52876a521c2..574ead0da2c 100644 --- a/code/modules/mob/living/silicon/robot/sprites/janitor.dm +++ b/code/modules/mob/living/silicon/robot/sprites/janitor.dm @@ -217,4 +217,34 @@ has_eye_light_sprites = TRUE has_custom_open_sprites = TRUE has_vore_belly_sprites = FALSE - rest_sprite_options = list("Default", "Bellyup") \ No newline at end of file + rest_sprite_options = list("Default", "Bellyup") + +/datum/robot_sprite/dogborg/tall/dullahanjanitormodule + module_type = "Janitor" + sprite_icon = 'icons/mob/dullahanborg/dullahan_jani.dmi' + +/datum/robot_sprite/dogborg/tall/dullahanjanitormodule/do_equipment_glamour(var/obj/item/weapon/robot_module/module) + if(!has_custom_equipment_sprites) + return + + ..() + + var/obj/item/device/dogborg/sleeper/compactor/DC = locate() in module.modules + if(DC) + DC.icon_state = "compactor" + +/datum/robot_sprite/dogborg/tall/dullahanjanitormodule/dullahan_janitor + name = "Dullahan" + sprite_icon_state = "dullahanjani" + has_eye_light_sprites = TRUE + has_custom_open_sprites = TRUE + has_vore_belly_sprites = TRUE + rest_sprite_options = list("Default", "Sit") + +/datum/robot_sprite/dogborg/tall/dullahanjanitormodule/dullahan_janitoralt + name = "Dullahan v2" + sprite_icon_state = "dullahanjani_alt" + has_eye_light_sprites = TRUE + has_custom_open_sprites = TRUE + has_vore_belly_sprites = TRUE + rest_sprite_options = list("Default", "Sit") diff --git a/code/modules/mob/living/silicon/robot/sprites/medical.dm b/code/modules/mob/living/silicon/robot/sprites/medical.dm index 358d81f5210..84d24b4d920 100644 --- a/code/modules/mob/living/silicon/robot/sprites/medical.dm +++ b/code/modules/mob/living/silicon/robot/sprites/medical.dm @@ -156,6 +156,8 @@ rest_sprite_options = list("Default", "Bellyup") + + // Surgeon // Regular sprites @@ -259,6 +261,10 @@ module_type = "Surgeon" sprite_icon = 'icons/mob/robot/surgical_large.dmi' + + + +//back to normal glamour /datum/robot_sprite/dogborg/tall/surgical/do_equipment_glamour(var/obj/item/weapon/robot_module/module) if(!has_custom_equipment_sprites) return @@ -406,6 +412,7 @@ module_type = "Crisis" sprite_icon = 'icons/mob/robot/crisis_large.dmi' + /datum/robot_sprite/dogborg/tall/crisis/do_equipment_glamour(var/obj/item/weapon/robot_module/module) if(!has_custom_equipment_sprites) return @@ -429,3 +436,43 @@ sprite_icon_state = "raptor" has_custom_equipment_sprites = TRUE rest_sprite_options = list("Default", "Bellyup") + +// dullahan crisis sprite stuff (tall) + +/datum/robot_sprite/dogborg/tall/dullahanmedicalmodule + module_type = list("Crisis", "Surgeon") + sprite_icon = 'icons/mob/dullahanborg/dullahan_med.dmi' + +/datum/robot_sprite/dogborg/tall/dullahanmedicalmodule/do_equipment_glamour(var/obj/item/weapon/robot_module/module) + if(!has_custom_equipment_sprites) + return + + ..() + + var/obj/item/weapon/shockpaddles/robot/SP = locate() in module.modules + if(SP) + SP.name = "paws of life" + SP.desc = "Zappy paws. For fixing cardiac arrest." + SP.icon = 'icons/mob/dogborg_vr.dmi' + SP.icon_state = "defibpaddles0" + SP.attack_verb = list("batted", "pawed", "bopped", "whapped") + + var/obj/item/device/dogborg/sleeper/SB = locate() in module.modules + if(SB) + SB.icon_state = "sleeper" + +/datum/robot_sprite/dogborg/tall/dullahanmedicalmodule/dullahanmedical + name = "Dullahan" + sprite_icon_state = "dullahanmed" + has_eye_light_sprites = TRUE + has_custom_open_sprites = TRUE + has_vore_belly_sprites = TRUE + rest_sprite_options = list("Default", "Sit") + +/datum/robot_sprite/dogborg/tall/dullahanmedicalmodule/dullahanmedicalalt + name = "Dullahan v2" + sprite_icon_state = "dullahanmed_alt" + has_eye_light_sprites = TRUE + has_custom_open_sprites = TRUE + has_vore_belly_sprites = TRUE + rest_sprite_options = list("Default", "Sit") diff --git a/code/modules/mob/living/silicon/robot/sprites/mining.dm b/code/modules/mob/living/silicon/robot/sprites/mining.dm index 71432e9d0be..b813fedd297 100644 --- a/code/modules/mob/living/silicon/robot/sprites/mining.dm +++ b/code/modules/mob/living/silicon/robot/sprites/mining.dm @@ -202,4 +202,70 @@ has_eye_light_sprites = TRUE has_custom_open_sprites = TRUE has_vore_belly_sprites = FALSE - rest_sprite_options = list("Default", "Bellyup") \ No newline at end of file + rest_sprite_options = list("Default", "Bellyup") + +// dullahan sprite stuff (tall cont.) + +/datum/robot_sprite/dogborg/tall/dullahanminermodule + module_type = "Miner" + sprite_icon = 'icons/mob/dullahanborg/dullahan_mine.dmi' + + +/datum/robot_sprite/dogborg/tall/dullahanminermodule/do_equipment_glamour(var/obj/item/weapon/robot_module/module) + if(!has_custom_equipment_sprites) + return + + ..() + + var/obj/item/device/dogborg/sleeper/compactor/supply/DCS = locate() in module.modules + if(DCS) + DCS.icon_state = "sleeperc" + + +/datum/robot_sprite/dogborg/tall/dullahanminermodule/dullahanminer + name = "Dullahan Miner" + sprite_icon_state = "dullahanmine" + has_eye_light_sprites = TRUE + has_custom_open_sprites = TRUE + has_vore_belly_sprites = TRUE + rest_sprite_options = list("Default", "Sit") + +/datum/robot_sprite/dogborg/tall/dullahanminermodule/dullahanmineralt + name = "Dullahan Miner v2" + sprite_icon_state = "dullahanmine_alt" + has_eye_light_sprites = TRUE + has_custom_open_sprites = TRUE + has_vore_belly_sprites = TRUE + rest_sprite_options = list("Default", "Sit") + + +/datum/robot_sprite/dogborg/tall/dullahancargomodule + module_type = "Miner" + sprite_icon = 'icons/mob/dullahanborg/dullahan_cargo.dmi' + +/datum/robot_sprite/dogborg/tall/dullahancargomodule/do_equipment_glamour(var/obj/item/weapon/robot_module/module) + if(!has_custom_equipment_sprites) + return + + ..() + + var/obj/item/device/dogborg/sleeper/compactor/supply/DCS = locate() in module.modules + if(DCS) + DCS.icon_state = "sleeperc" + + +/datum/robot_sprite/dogborg/tall/dullahancargomodule/dullahancargo + name = "Dullahan cargo" + sprite_icon_state = "dullahancargo" + has_eye_light_sprites = TRUE + has_custom_open_sprites = TRUE + has_vore_belly_sprites = TRUE + rest_sprite_options = list("Default", "Sit") + +/datum/robot_sprite/dogborg/tall/dullahancargomodule/dullahancargoalt + name = "Dullahan cargo v2" + sprite_icon_state = "dullahancargo_alt" + has_eye_light_sprites = TRUE + has_custom_open_sprites = TRUE + has_vore_belly_sprites = TRUE + rest_sprite_options = list("Default", "Sit") diff --git a/code/modules/mob/living/silicon/robot/sprites/science.dm b/code/modules/mob/living/silicon/robot/sprites/science.dm index 6ef9fe8669b..cb59a7031e4 100644 --- a/code/modules/mob/living/silicon/robot/sprites/science.dm +++ b/code/modules/mob/living/silicon/robot/sprites/science.dm @@ -219,3 +219,51 @@ has_custom_open_sprites = TRUE has_vore_belly_sprites = FALSE rest_sprite_options = list("Default", "Bellyup") + + +// dullahan sprite stuff cont. + + +/datum/robot_sprite/dogborg/tall/dullahansciencemodule + module_type = "Research" + sprite_icon = 'icons/mob/dullahanborg/dullahan_sci.dmi' + + var/has_taser_sprite = FALSE + +/datum/robot_sprite/dogborg/tall/dullahansciencemodule/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg) + if(has_taser_sprite && istype(ourborg.module_active, /obj/item/weapon/gun/energy/taser/xeno/robot)) + ourborg.add_overlay("[sprite_icon_state]-taser") + +/datum/robot_sprite/dogborg/tall/dullahansciencemodule/do_equipment_glamour(var/obj/item/weapon/robot_module/module) + if(!has_custom_equipment_sprites) + return + + ..() + + var/obj/item/weapon/shockpaddles/robot/jumper/J = locate() in module.modules + if(J) + J.name = "jumper paws" + J.desc = "Zappy paws. For rebooting a full body prostetic." + J.icon = 'icons/mob/dogborg_vr.dmi' + J.icon_state = "defibpaddles0" + J.attack_verb = list("batted", "pawed", "bopped", "whapped") + + var/obj/item/device/dogborg/sleeper/compactor/analyzer/DA = locate() in module.modules + if(DA) + DA.icon_state = "analyzer" + +/datum/robot_sprite/dogborg/tall/dullahansciencemodule/dullahanscience + name = "Dullahan" + sprite_icon_state = "dullahansci" + has_eye_light_sprites = TRUE + has_custom_open_sprites = TRUE + has_vore_belly_sprites = TRUE + rest_sprite_options = list("Default", "Sit") + +/datum/robot_sprite/dogborg/tall/dullahansciencemodule/dullahansciencealt + name = "Dullahan v2" + sprite_icon_state = "dullahansci_alt" + has_eye_light_sprites = TRUE + has_custom_open_sprites = TRUE + has_vore_belly_sprites = TRUE + rest_sprite_options = list("Default", "Sit") diff --git a/code/modules/mob/living/silicon/robot/sprites/security.dm b/code/modules/mob/living/silicon/robot/sprites/security.dm index 725e26c63ba..43a6abdb3ce 100644 --- a/code/modules/mob/living/silicon/robot/sprites/security.dm +++ b/code/modules/mob/living/silicon/robot/sprites/security.dm @@ -263,3 +263,48 @@ has_custom_open_sprites = TRUE has_vore_belly_sprites = FALSE rest_sprite_options = list("Default", "Bellyup") + + +// dullahan sprite stuff cont. modular. + +/datum/robot_sprite/dogborg/tall/dullahansecuritymodule + module_type = "Security" + sprite_icon = 'icons/mob/dullahanborg/dullahan_sec.dmi' + var/has_laser_sprite = FALSE + var/has_taser_sprite = FALSE + +/datum/robot_sprite/dogborg/tall/dullahansecuritymodule/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg) + if(has_laser_sprite && istype(ourborg.module_active, /obj/item/weapon/gun/energy/laser/mounted)) + ourborg.add_overlay("[sprite_icon_state]-laser") + if(has_taser_sprite && istype(ourborg.module_active, /obj/item/weapon/gun/energy/taser/mounted/cyborg)) + ourborg.add_overlay("[sprite_icon_state]-taser") + +/datum/robot_sprite/dogborg/tall/dullahansecuritymodule/do_equipment_glamour(var/obj/item/weapon/robot_module/module) + if(!has_custom_equipment_sprites) + return + ..() + + var/obj/item/weapon/dogborg/pounce/SA = locate() in module.modules + if(SA) + SA.name = "pounce" + SA.icon_state = "pounce" + + var/obj/item/device/dogborg/sleeper/K9/SB = locate() in module.modules + if(SB) + SB.icon_state = "sleeperb" + +/datum/robot_sprite/dogborg/tall/dullahansecuritymodule/dullahansecurity + name = "Dullahan" + sprite_icon_state = "dullahansec" + has_eye_light_sprites = TRUE + has_custom_open_sprites = TRUE + has_vore_belly_sprites = TRUE + rest_sprite_options = list("Default", "Sit") + +/datum/robot_sprite/dogborg/tall/dullahansecuritymodule/dullahansecurityalt + name = "Dullahan v2" + sprite_icon_state = "dullahansec_alt" + has_eye_light_sprites = TRUE + has_custom_open_sprites = TRUE + has_vore_belly_sprites = TRUE + rest_sprite_options = list("Default", "Sit") diff --git a/config/example/admins.txt b/config/example/admins.txt index 3b830cd27ff..414a9195a06 100644 --- a/config/example/admins.txt +++ b/config/example/admins.txt @@ -5,4 +5,4 @@ # Ranks can be anything defined in admin_ranks.txt ~Carn # ###################################################################### -# not_a_user - Admin +# not_a_user - Admin \ No newline at end of file diff --git a/icons/mob/dullahanborg/dullahan_cargo.dmi b/icons/mob/dullahanborg/dullahan_cargo.dmi new file mode 100644 index 00000000000..f84aeb483db Binary files /dev/null and b/icons/mob/dullahanborg/dullahan_cargo.dmi differ diff --git a/icons/mob/dullahanborg/dullahan_credit.txt b/icons/mob/dullahanborg/dullahan_credit.txt new file mode 100644 index 00000000000..b6d1d91811c --- /dev/null +++ b/icons/mob/dullahanborg/dullahan_credit.txt @@ -0,0 +1,12 @@ +edit: meka was not the creator of this, fixed. + +Credit: +these sprites were originally made by: +- https://github.com/Cecily-C-Catherine +- Toriate +and was partly canabalized from meka. +: for bubberstation + + +these sprites were edited by asher-49 and MAK for chompstation and roguestar. +- animations made by asher-49 diff --git a/icons/mob/dullahanborg/dullahan_eng.dmi b/icons/mob/dullahanborg/dullahan_eng.dmi new file mode 100644 index 00000000000..c49b21da59b Binary files /dev/null and b/icons/mob/dullahanborg/dullahan_eng.dmi differ diff --git a/icons/mob/dullahanborg/dullahan_jani.dmi b/icons/mob/dullahanborg/dullahan_jani.dmi new file mode 100644 index 00000000000..f537935ce49 Binary files /dev/null and b/icons/mob/dullahanborg/dullahan_jani.dmi differ diff --git a/icons/mob/dullahanborg/dullahan_med.dmi b/icons/mob/dullahanborg/dullahan_med.dmi new file mode 100644 index 00000000000..866230580c3 Binary files /dev/null and b/icons/mob/dullahanborg/dullahan_med.dmi differ diff --git a/icons/mob/dullahanborg/dullahan_mine.dmi b/icons/mob/dullahanborg/dullahan_mine.dmi new file mode 100644 index 00000000000..10a3003003c Binary files /dev/null and b/icons/mob/dullahanborg/dullahan_mine.dmi differ diff --git a/icons/mob/dullahanborg/dullahan_sci.dmi b/icons/mob/dullahanborg/dullahan_sci.dmi new file mode 100644 index 00000000000..6f7736c8f74 Binary files /dev/null and b/icons/mob/dullahanborg/dullahan_sci.dmi differ diff --git a/icons/mob/dullahanborg/dullahan_sec.dmi b/icons/mob/dullahanborg/dullahan_sec.dmi new file mode 100644 index 00000000000..e07c7a18835 Binary files /dev/null and b/icons/mob/dullahanborg/dullahan_sec.dmi differ diff --git a/icons/mob/dullahanborg/dullahan_serv.dmi b/icons/mob/dullahanborg/dullahan_serv.dmi new file mode 100644 index 00000000000..86efd734137 Binary files /dev/null and b/icons/mob/dullahanborg/dullahan_serv.dmi differ diff --git a/icons/mob/dullahanborg/readme.md b/icons/mob/dullahanborg/readme.md new file mode 100644 index 00000000000..d91eb719b49 --- /dev/null +++ b/icons/mob/dullahanborg/readme.md @@ -0,0 +1,30 @@ +Current version: v0.8 + +### Credits: +TheOOZ (https://github.com/theOOZ), AKA ghostsheep (https://twitter.com/_ghostsheep) +MekaNIKA skinline + - Peacekeeper + - Service + - Service (Alt) + - Janitor + - Medical + - Cargo-technician + - Miner + - Syndicate + - Ninja + +### Terms of use: +Tallborg and its MekaNIKA skinline falls under the same licensing as the TG-13 repository. + +If you are porting this content, it is the personal request of the artist that: + - This readme, and the credit icon_state within the .dmi's remain present besides the skinline art. + - This skinline is ported in full, even if your codebase has no use for a certain job-module. + +This content was made for free. + + + + +EDIT: +these sprites were edited by asher-49 and MAK +- animations made by asher-49 \ No newline at end of file