Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dullahanborg #1225

Merged
merged 1 commit into from
Dec 15, 2024
Merged

Dullahanborg #1225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 47 additions & 5 deletions code/modules/mob/living/silicon/robot/robot_modules.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,8 @@
"Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "medraptor-b"), // SPLURT Addon (ChompS Port)
"Raptor V-4 (alt)" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "traumaraptor-b"), // SPLURT Addon (ChompS Port)
"SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor_med-b"), // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub)
"Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_medical") // SPLURT Addon (Fallout 13)
"Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_medical"), // SPLURT Addon (Fallout 13)
"Dullahan" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "dullahanmed")
)
var/list/L = list("Medihound" = "medihound", "Medihound Dark" = "medihounddark", "Vale" = "valemed")
for(var/a in L)
Expand Down Expand Up @@ -577,6 +578,11 @@
moduleselect_icon = "medihound"
moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi'
dogborg = TRUE
if("Dullahan")
cyborg_base_icon = "dullahanmed"
cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi'
hat_offset = 3
hasrest = TRUE
else
return FALSE
return ..()
Expand Down Expand Up @@ -661,7 +667,8 @@
"Feline" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "vixengi-b"), // SPLURT Addon (ChompS Port)
"Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "engiraptor-b"), // SPLURT Addon (ChompS Port)
"SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor_eng-b"), // BubberStation Port; Made by @aKromatopzia (GitHub)
"Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_engineer") // SPLURT Addon (Fallout 13)
"Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_engineer"), // SPLURT Addon (Fallout 13)
"Dullahan" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "dullahaneng")
)
var/list/L = list("Pup Dozer" = "pupdozer", "Vale" = "valeeng")
for(var/a in L)
Expand Down Expand Up @@ -840,6 +847,11 @@
cyborg_base_icon = "smolraptor_eng"
cyborg_icon_override = 'modular_zubbers/icons/mob/smolraptor.dmi'
dogborg = TRUE
if("Dullahan")
cyborg_base_icon = "dullahaneng"
cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi'
hat_offset = 3
hasrest = TRUE
else
return FALSE
return ..()
Expand Down Expand Up @@ -906,7 +918,8 @@
"Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "secraptor-b"), // SPLURT Addon (ChompS Port)
"Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_security"), // SPLURT Addon (Fallout 13)
"Sentry Bot" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "sentrybot"), // SPLURT Addon (Fallout 13)
"Securitron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "securitron") // SPLURT Addon (Fallout 13)
"Securitron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "securitron"), // SPLURT Addon (Fallout 13)
"Dullahan" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "dullahanpeace")
)
var/list/L = list("K9" = "k9", "Vale" = "valesec", "K9 Dark" = "k9dark")
for(var/a in L)
Expand Down Expand Up @@ -1076,6 +1089,11 @@
sleeper_overlay = "secraptor-sleeper"
cyborg_icon_override = 'modular_splurt/icons/mob/robots_64x45.dmi'
dogborg = TRUE
if("Dullahan")
cyborg_base_icon = "dullahanpeace"
cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi'
hat_offset = 3
hasrest = TRUE
else
return FALSE
return ..()
Expand Down Expand Up @@ -1140,7 +1158,8 @@
"Feline" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "vixpk-b"), // SPLURT Addon (ChompS Port)
"Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "peaceraptor-b"), // SPLURT Addon (ChompS Port)
"SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor_pk-b"), // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub)
"Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_peace") // SPLURT Addon (Fallout 13)
"Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_peace"), // SPLURT Addon (Fallout 13)
"Dullahan" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "dullahanpeace")
))
var/peace_borg_icon = show_radial_menu(R, R , peace_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
switch(peace_borg_icon)
Expand Down Expand Up @@ -1244,6 +1263,11 @@
cyborg_base_icon = "smolraptor_pk"
cyborg_icon_override = 'modular_zubbers/icons/mob/smolraptor.dmi'
dogborg = TRUE
if("Dullahan")
cyborg_base_icon = "dullahanpeace"
cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi'
hat_offset = 3
hasrest = TRUE
else
return FALSE
return ..()
Expand Down Expand Up @@ -1397,6 +1421,7 @@
"(Service Alt) K4T" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "k4tserve_alt1"), // SPLURT Addon
"(Service) Feline" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "vixserv-b"), // SPLURT Addon (ChompS Port)
"(Service) Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "serviraptor-b"), // SPLURT Addon (ChompS Port)
"(Service) Dullahan" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "dullahanserv"),
"(Fancy) Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "fancyraptor-b"), // SPLURT Addon (ChompS Port)
"(Service) SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor_srv-b"), // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub)
"(Janitor) Default" = image(icon = 'icons/mob/robots.dmi', icon_state = "janitor"),
Expand Down Expand Up @@ -1434,6 +1459,7 @@
"(Janitor Alt) Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "sciraptor-b"), // SPLURT Addon (ChompS Port)
"(Janitor) SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor_jani-b"), // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub)
"(Janitor Alt) SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor_sci-b"), // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub)
"(Janitor) Dullahan" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "dullahanjani"),
"(Waiter) Meka" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "mekaserve_alt"), // SPLURT Addon
"(Service) Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_service"), // SPLURT Addon (Fallout 13)
"(Janitor) Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_janitor"), // SPLURT Addon (Fallout 13)
Expand Down Expand Up @@ -1744,6 +1770,16 @@
cyborg_base_icon = "handy_pleasure"
cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi'
hat_offset = 3
if("(Service) Dullahan")
cyborg_base_icon = "dullahanserv"
cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi'
hat_offset = 3
hasrest = TRUE
if("(Janitor) Dullahan")
cyborg_base_icon = "dullahanjani"
cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi'
hat_offset = 3
hasrest = TRUE
else
return FALSE
return ..()
Expand Down Expand Up @@ -1816,7 +1852,8 @@
"Feline" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "vixmine-b"), // SPLURT Adoon (ChompS Port)
"Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "mineraptor-b"), // SPLURT Adoon (ChompS Port)
"SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor_min-b"), // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub)
"Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_miner") // SPLURT Addon (Fallout 13)
"Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_miner"), // SPLURT Addon (Fallout 13)
"Dullahan" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "dullahanmine")
)
var/list/L = list("Blade" = "blade", "Vale" = "valemine")
for(var/a in L)
Expand Down Expand Up @@ -1972,6 +2009,11 @@
cyborg_base_icon = "smolraptor_min"
cyborg_icon_override = 'modular_zubbers/icons/mob/smolraptor.dmi'
dogborg = TRUE
if("Dullahan")
cyborg_base_icon = "dullahanmine"
cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi'
hat_offset = 3
hasrest = TRUE
else
return FALSE
return ..()
Expand Down
8 changes: 7 additions & 1 deletion modular_sand/code/modules/mob/living/silicon/robot/robot_modules.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@
"Meka" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "mekasyndi"), // SPLURT Addon (Bubbers Port)
"M-Meka" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "mmekasyndi"), // SPLURT Addon (Bubbers Port)
"F-Meka" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "fmekasyndi"), // SPLURT Addon (Bubbers Port)
"K4T" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "k4tsyndi") // SPLURT Addon (Bubbers Port)
"K4T" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "k4tsyndi"), // SPLURT Addon (Bubbers Port)
"Dullahan" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "dullahansyndi")
))
var/syndiejack_icon = show_radial_menu(R, R , syndicatejack_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
switch(syndiejack_icon)
Expand Down Expand Up @@ -137,6 +138,11 @@
cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi'
hat_offset = 3
hasrest = TRUE
if("Dullahan")
cyborg_base_icon = "dullahansyndi"
cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi'
hat_offset = 3
hasrest = TRUE
else
return FALSE
return ..()
Expand Down
16 changes: 14 additions & 2 deletions modular_splurt/code/modules/mob/living/silicon/robot/robot_modules.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy"),
"Robo-Brain" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "robobrain"),
"Cyclone" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "cyclone"),
"SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor-b") // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub)
"SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor-b"), // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub)
"Dullahan" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "dullahanclown")
)
stand_icons = sort_list(stand_icons)
var/stand_borg_icon = show_radial_menu(R, R , stand_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
Expand Down Expand Up @@ -95,6 +96,11 @@
cyborg_base_icon = "smolraptor"
cyborg_icon_override = 'modular_zubbers/icons/mob/smolraptor.dmi'
dogborg = TRUE
if("Dullahan")
cyborg_base_icon = "dullahanclown"
cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi'
hat_offset = 3
hasrest = TRUE
return ..()

/obj/item/robot_module/clown/be_transformed_to(obj/item/robot_module/old_module)
Expand Down Expand Up @@ -199,7 +205,8 @@
"K4T" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "k4tcargo"), // SPLURT Addon
"K4T (alt)" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "k4tcargo_alt1"), // SPLURT Addon
"Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "caraptor-b"), // ChompS Port (base); Additional spriting by @ertyuk421
"SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor_crg-b") // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub)
"SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor_crg-b"), // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub)
"Dullahan" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "dullahancargo")
)
var/list/L = list("Cargohound" = "cargohound", "Cargohound Dark" = "cargohounddark", "Vale" = "valecargo", "Feline" = "vixcargo")
for(var/a in L)
Expand Down Expand Up @@ -285,6 +292,11 @@
cyborg_base_icon = "smolraptor_crg"
cyborg_icon_override = 'modular_zubbers/icons/mob/smolraptor.dmi'
dogborg = TRUE
if("Dullahan")
cyborg_base_icon = "dullahancargo"
cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi'
hat_offset = 3
hasrest = TRUE
else
return FALSE
return ..()
Expand Down
Binary file modified modular_splurt/icons/mob/robots_32x64.dmi
View file
Open in desktop
Binary file not shown.