cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-30 16:16:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

haydee

Browse Source 
that ass better fart
This commit is contained in:
BongaTheProto
2023-08-03 03:11:05 -05:00
parent 85c926e314
commit 83bb8a2e11
3 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot_modules.dm
+29 -8
View File
@@ -611,7 +611,8 @@
"Engihound Dark" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "engihounddark-b"), // SPLURT Adoon (Skyrat Port)
"Otie" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "otiee-b"), // SPLURT Adoon (Skyrat Port)
"Drake" = image(icon = 'modular_sand/icons/mob/cyborg/drakemech.dmi', icon_state = "drakeengbox"),
"Assaultron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "assaultron_engi") // SPLURT Addon
"Assaultron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "assaultron_engi"), // SPLURT Addon
"Haydee" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "haydeeengi") // SPLURT Addon
)
var/list/L = list("Pup Dozer" = "pupdozer", "Vale" = "valeeng")
for(var/a in L)
@@ -734,10 +735,14 @@
cyborg_icon_override = 'modular_sand/icons/mob/cyborg/drakemech.dmi'
sleeper_overlay = "drakesecsleeper"
dogborg = TRUE
if("Assaultron") // SPLURT Addon (Hyper Port)
if("Assaultron") // SPLURT Addon
cyborg_base_icon = "assaultron_engi"
cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi'
hat_offset = 3
if("Haydee") // SPLURT Addon
cyborg_base_icon = "haydeeengi"
cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi'
hat_offset = 3
else
return FALSE
return ..()
@@ -794,9 +799,8 @@
"EdgyBoy" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "badboi-b"), // SPLURT Addon (VIRGO Port)
"EdgyGirl" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "prettyboi-b"), // SPLURT Addon (VIRGO Port)
"Drake" = image(icon = 'modular_sand/icons/mob/cyborg/drakemech.dmi', icon_state = "drakesecbox"),
"Assaultron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "assaultron_sec") // SPLURT Addon
"Assaultron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "assaultron_sec"), // SPLURT Addon
"Haydee" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "haydeesec") // SPLURT Addon
)
var/list/L = list("K9" = "k9", "Vale" = "valesec", "K9 Dark" = "k9dark")
for(var/a in L)
@@ -920,12 +924,14 @@
sleeper_overlay = "drakesecsleeper"
cyborg_icon_override = 'modular_sand/icons/mob/cyborg/drakemech.dmi'
dogborg = TRUE
if("Assaultron") // SPLURT Addon
cyborg_base_icon = "assaultron_sec"
cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi'
hat_offset = 3
if("Haydee") // SPLURT Addon
cyborg_base_icon = "haydeesec"
cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi'
hat_offset = 3
else
return FALSE
return ..()
@@ -982,6 +988,7 @@
"Vale" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "valepeace-b"), // SPLURT Adoon (Skyrat Port)
"Drake" = image(icon = 'modular_sand/icons/mob/cyborg/drakemech.dmi', icon_state = "drakepeacebox"),
"Assaultron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "assaultron_peacekeeper"), // SPLURT Adoon
"Haydee" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "haydeepk"), // SPLURT Addon
))
var/peace_borg_icon = show_radial_menu(R, R , peace_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
switch(peace_borg_icon)
@@ -1043,6 +1050,10 @@
cyborg_base_icon = "assaultron_peacekeeper"
cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi'
hat_offset = 3
if("Haydee") // SPLURT Addon
cyborg_base_icon = "haydeepk"
cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi'
hat_offset = 3
else
return FALSE
return ..()
@@ -1211,6 +1222,7 @@
"(Janitor) Fembot" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "fembot-service"), // SPLURT Addon
"(Janitor) Drake" = image(icon = 'modular_sand/icons/mob/cyborg/drakemech.dmi', icon_state = "drakejanitbox"),
"Assaultron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "assaultron_service"), // SPLURT Addon
"(Janitor) Haydee" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "haydeejan"), // SPLURT Addon
)
var/list/L = list("(Service) DarkK9" = "k50", "(Service) Vale" = "valeserv", "(Service) ValeDark" = "valeservdark",
"(Janitor) Scrubpuppy" = "scrubpup")
@@ -1395,6 +1407,10 @@
cyborg_base_icon = "assaultron_service"
cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi'
hat_offset = 3
if("(Janitor) Haydee") // SPLURT Addon
cyborg_base_icon = "haydeejan"
cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi'
hat_offset = 3
else
return FALSE
return ..()
@@ -1456,7 +1472,8 @@
"Cargohound Dark" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "cargohounddark-b"), // SPLURT Adoon (Skyrat Port)
"Otie" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "otiec-b"), // SPLURT Adoon (Skyrat Port)
"Drake" = image(icon = 'modular_sand/icons/mob/cyborg/drakemech.dmi', icon_state = "drakeminebox"),
"Assaultron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "assaultron_mining"), // SPLURT
"Assaultron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "assaultron_mining"), // SPLURT Addon
"Haydee" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "haydeeminer") // SPLURT Addon
)
var/list/L = list("Blade" = "blade", "Vale" = "valemine")
for(var/a in L)
@@ -1560,6 +1577,10 @@
cyborg_base_icon = "assaultron_mining"
cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi'
hat_offset = 3
if("Haydee") // SPLURT Addon
cyborg_base_icon = "haydeeminer"
cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi'
hat_offset = 3
else
return FALSE
return ..()
modular_splurt/icons/mob/robots.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 286 KiB

After

Width:  |  Height:  |  Size: 302 KiB

tgstation.dme
+3 -3
View File
@@ -4385,8 +4385,8 @@
#include "modular_splurt\code\datums\components\crafting\recipes\recipes_robot.dm"
#include "modular_splurt\code\datums\components\storage\concrete\pockets.dm"
#include "modular_splurt\code\datums\elements\crawl_under.dm"
#include "modular_splurt\code\datums\elements\mob_holder.dm"
#include "modular_splurt\code\datums\elements\flavor_text.dm"
#include "modular_splurt\code\datums\elements\mob_holder.dm"
#include "modular_splurt\code\datums\elements\smalltalk.dm"
#include "modular_splurt\code\datums\elements\spooky.dm"
#include "modular_splurt\code\datums\elements\wuv.dm"
@@ -4759,8 +4759,8 @@
#include "modular_splurt\code\modules\mining\equipment\machine_vending.dm"
#include "modular_splurt\code\modules\mining\lavaland\necropolis_chests.dm"
#include "modular_splurt\code\modules\mob\emote.dm"
#include "modular_splurt\code\modules\mob\inventory.dm"
#include "modular_splurt\code\modules\mob\femclaw.dm"
#include "modular_splurt\code\modules\mob\inventory.dm"
#include "modular_splurt\code\modules\mob\mob.dm"
#include "modular_splurt\code\modules\mob\mob_defines.dm"
#include "modular_splurt\code\modules\mob\mob_helpers.dm"
@@ -4837,8 +4837,8 @@
#include "modular_splurt\code\modules\mob\living\simple_animal\hostile\deathclaw\funclaw.dm"
#include "modular_splurt\code\modules\mob\living\simple_animal\hostile\megafauna\blood_drunk_miner.dm"
#include "modular_splurt\code\modules\mob\living\simple_animal\hostile\megafauna\king_of_goats.dm"
#include "modular_splurt\code\modules\mob\living\simple_animal\hostile\megafauna\sand.dm"
#include "modular_splurt\code\modules\mob\living\simple_animal\hostile\megafauna\penguinhiero.dm"
#include "modular_splurt\code\modules\mob\living\simple_animal\hostile\megafauna\sand.dm"
#include "modular_splurt\code\modules\paperwork\pen.dm"
#include "modular_splurt\code\modules\photography\photos\album.dm"
#include "modular_splurt\code\modules\photography\photos\photo.dm"