Skip to content

Commit

Permalink
[Continues Bubberstation#879] Adds corrupt hounds as miner borgs (Bub…
Browse files Browse the repository at this point in the history
…berstation#1029)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
This adds new wideborgs to the game: The Corrupt borg and Corrupt alt
borgs, as Miner sprites. Big and scary, these guys look like they bite.
<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game
More variety is always good for the game! Now miner borgs as part of
sprite alignment.
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Proof Of Testing

![image](https://github.com/Bubberstation/Bubberstation/assets/110273561/34009d3f-73d4-49a6-87f5-cece71962f8c)

![image](https://github.com/Bubberstation/Bubberstation/assets/110273561/879f5de9-dd50-4c72-a7d7-75fd78bf8118)

![image](https://github.com/Bubberstation/Bubberstation/assets/110273561/075b5893-79c5-47fb-8411-b7cb33811728)

<!-- Compile and run your code locally. Make sure it works. This is the
place to show off your changes! We are not responsible for testing your
features. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

🆑 ReturnToZender
add: Corrupt and Corrupt Alt borg sprites to the peacekeeper tab!
fix: code cleanup in the borg modular file, fixed a typo, added a
missing mapload
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->

---------

Co-authored-by: Esixdotnet <[email protected]>
Co-authored-by: Waterpig <[email protected]>
Co-authored-by: The Sharkening <[email protected]>
Co-authored-by: Bubberbot <[email protected]>
Co-authored-by: thegrb93 <[email protected]>
Co-authored-by: BurgerLUA <[email protected]>
  • Loading branch information
7 people authored Jan 23, 2024
1 parent c136b06 commit 12f5a82
Show file tree
Hide file tree
Showing 17 changed files with 108 additions and 19 deletions.
2 changes: 1 addition & 1 deletion code/__DEFINES/~~bubber_defines/robot_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
#define CYBORG_ICON_CARGO_LARGE_BUBBER 'modular_zubbers/modules/borgs/sprites/largerobot_cargo.dmi'

#define CYBORG_ICON_SEC_WIDE_BUBBER 'modular_zubbers/modules/borgs/sprites/widerobot_sec.dmi'
#define CYBORG_ICON_SEC_TALL_BUBBER 'modular_zubbers/modules/borgs/sprites/tallrobot_sec.dmi'
#define CYBORG_ICON_SEC_LARGE_BUBBER 'modular_zubbers/modules/borgs/sprites/largerobot_sec.dmi'

#define CYBORG_ICON_ENG_WIDE_BUBBER 'modular_zubbers/modules/borgs/sprites/widerobot_eng.dmi'
#define CYBORG_ICON_ENG_LARGE_BUBBER 'modular_zubbers/modules/borgs/sprites/largerobot_eng.dmi'

#define CYBORG_ICON_PEACEKEEPER_WIDE_BUBBER 'modular_zubbers/modules/borgs/sprites/widerobot_pk.dmi'
#define CYBORG_ICON_PEACEKEEPER_TALL_BUBBER 'modular_zubbers/modules/borgs/sprites/tallrobot_pk.dmi'
#define CYBORG_ICON_PEACEKEEPER_LARGE_BUBBER 'modular_zubbers/modules/borgs/sprites/largerobot_pk.dmi'

#define CYBORG_ICON_SERVICE_WIDE_BUBBER 'modular_zubbers/modules/borgs/sprites/widerobot_serv.dmi'
Expand Down
125 changes: 107 additions & 18 deletions modular_zubbers/modules/borgs/code/robot_model.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/obj/item/robot_model/centcom //Sprites by QuartzAdachi
/obj/item/robot_model/centcom
name = "Central Command"
basic_modules = list(
/obj/item/assembly/flash/cyborg,
Expand Down Expand Up @@ -29,70 +29,151 @@
)
special_light_key = null
borg_skins = list(
"Raptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, SKIN_ICON = CYBORG_ICON_CENTCOM_LARGE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)), //aKhroma :)
"Vale" = list(SKIN_ICON_STATE = "vale", SKIN_ICON = CYBORG_ICON_CENTCOM_WIDE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
"Raptor" = list(
SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR,
SKIN_ICON = CYBORG_ICON_CENTCOM_LARGE_BUBBER,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
), //aKhroma :)
"Vale" = list(
SKIN_ICON_STATE = "vale",
SKIN_ICON = CYBORG_ICON_CENTCOM_WIDE_BUBBER,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)
),
)

/obj/item/robot_model/centcom/rebuild_modules()
..()
var/mob/living/silicon/robot/cyborg = loc
cyborg.faction |= ROLE_DEATHSQUAD //You're part of CENTCOM now

/obj/item/robot_model/syndicate/remove_module(obj/item/removed_module, delete_after)
/obj/item/robot_model/centcom/remove_module(obj/item/removed_module, delete_after)
..()
var/mob/living/silicon/robot/cyborg = loc
cyborg.faction -= ROLE_DEATHSQUAD //You're no longer part of CENTCOM


/* BUBBER SPRITE ADDITIONS BELOW */
/obj/item/robot_model/medical/Initialize(mapload)
. = ..()
borg_skins |= list(
"Raptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, SKIN_ICON = CYBORG_ICON_MED_LARGE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
"Raptor" = list(
SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR,
SKIN_ICON = CYBORG_ICON_MED_LARGE_BUBBER,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
),
)

/obj/item/robot_model/engineering/Initialize(mapload)
. = ..()
borg_skins |= list(
"Raptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, SKIN_ICON = CYBORG_ICON_ENG_LARGE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
"Raptor" = list(
SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR,
SKIN_ICON = CYBORG_ICON_ENG_LARGE_BUBBER,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
),
)

/obj/item/robot_model/janitor/Initialize(mapload)
. = ..()
borg_skins |= list(
"Raptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, SKIN_ICON = CYBORG_ICON_JANI_LARGE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
//64x48 sprites below (Raptor)
"Raptor" = list(
SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR,
SKIN_ICON = CYBORG_ICON_JANI_LARGE_BUBBER,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
),
)

/obj/item/robot_model/miner/Initialize(mapload)
. = ..()
borg_skins |= list(
"Raptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, SKIN_ICON = CYBORG_ICON_MINING_LARGE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
//64x32 Sprites below (Wide)
"Corrupt" = list(
SKIN_ICON_STATE = "corrupt",
SKIN_ICON = CYBORG_ICON_MINING_WIDE_BUBBER,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)
),
"Corrupt Alt" = list(
SKIN_ICON_STATE = "corruptalt",
SKIN_ICON = CYBORG_ICON_MINING_WIDE_BUBBER,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)
),
//64x48 sprites below (Raptor)
"Raptor" = list(
SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR,
SKIN_ICON = CYBORG_ICON_MINING_LARGE_BUBBER,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
),
)

/obj/item/robot_model/security/Initialize()
/obj/item/robot_model/security/Initialize(mapload)
. = ..()
borg_skins |= list(
"Meka - Bluesec" = list(SKIN_ICON_STATE = "mekasecalt", SKIN_ICON = CYBORG_ICON_SEC_TALL_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
"Raptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, SKIN_ICON = CYBORG_ICON_SEC_LARGE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
//32x64 Sprites below (Tall)
"Meka - Bluesec" = list(
SKIN_ICON_STATE = "mekasecalt",
SKIN_ICON = CYBORG_ICON_PEACEKEEPER_TALL_BUBBER,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL),
SKIN_HAT_OFFSET = 15
),
//64x48 sprites below (Raptor)
"Raptor" = list(
SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR,
SKIN_ICON = CYBORG_ICON_SEC_LARGE_BUBBER,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
),
)

/obj/item/robot_model/peacekeeper/Initialize()
. = ..()
borg_skins |= list(
"Raptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, SKIN_ICON = CYBORG_ICON_PEACEKEEPER_LARGE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
"Raptor" = list(
SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR,
SKIN_ICON = CYBORG_ICON_PEACEKEEPER_LARGE_BUBBER,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
),
)

/obj/item/robot_model/peacekeeper/Initialize(mapload)
.=..()
borg_skins |= list(
//32x64 Sprites below (Tall)
"Meka - Bluesec" = list(
SKIN_ICON_STATE = "mekasecalt",
SKIN_ICON = CYBORG_ICON_PEACEKEEPER_TALL_BUBBER,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL),
SKIN_HAT_OFFSET = 15
),
//64x32 Sprites below (Wide)
"Raptor" = list(
SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR,
SKIN_ICON = CYBORG_ICON_PEACEKEEPER_LARGE_BUBBER,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
),
)

/obj/item/robot_model/service/Initialize(mapload)
. = ..()
borg_skins |= list(
"Fancy Raptor" = list(SKIN_ICON_STATE = "fancyraptor", SKIN_ICON = CYBORG_ICON_SERVICE_LARGE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
"Fancy Raptor" = list(
SKIN_ICON_STATE = "fancyraptor",
SKIN_ICON = CYBORG_ICON_SERVICE_LARGE_BUBBER,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
),
)

/obj/item/robot_model/syndicatejack/Initialize()
. = ..()
borg_skins |= list(
"Vale" = list(SKIN_ICON_STATE = "vale", SKIN_ICON = CYBORG_ICON_SYNDIE_WIDE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
"Pupdozer" = list(SKIN_ICON_STATE = "pupdozer", SKIN_ICON = CYBORG_ICON_SYNDIE_WIDE_BUBBER, SKIN_FEATURES = list(TRAIT_R_WIDE)),
"Vale" = list(
SKIN_ICON_STATE = "vale",
SKIN_ICON = CYBORG_ICON_SYNDIE_WIDE_BUBBER,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)
),
"Pupdozer" = list(
SKIN_ICON_STATE = "pupdozer",
SKIN_ICON = CYBORG_ICON_SYNDIE_WIDE_BUBBER,
SKIN_FEATURES = list(TRAIT_R_WIDE)
),
"Mediraptor" = list(
SKIN_ICON_STATE = "mediraptor",
SKIN_ICON = CYBORG_ICON_SYNDIE_LARGE_BUBBER,
Expand Down Expand Up @@ -169,7 +250,15 @@
/obj/item/robot_model/ninja/Initialize()
. = ..()
borg_skins |= list(
"Raptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, SKIN_ICON = CYBORG_ICON_NINJA_WIDE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
"Vale" = list(SKIN_ICON_STATE = "valeninja", SKIN_ICON = CYBORG_ICON_NINJA_WIDE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
"Raptor" = list(
SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR,
SKIN_ICON = CYBORG_ICON_NINJA_WIDE_BUBBER,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)
),
"Vale" = list(
SKIN_ICON_STATE = "valeninja",
SKIN_ICON = CYBORG_ICON_NINJA_WIDE_BUBBER,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)
),
)
*/
Binary file modified modular_zubbers/modules/borgs/sprites/largerobot_eng.dmi
Binary file not shown.
Binary file modified modular_zubbers/modules/borgs/sprites/largerobot_jani.dmi
Binary file not shown.
Binary file modified modular_zubbers/modules/borgs/sprites/largerobot_med.dmi
Binary file not shown.
Binary file modified modular_zubbers/modules/borgs/sprites/largerobot_mine.dmi
Binary file not shown.
Binary file modified modular_zubbers/modules/borgs/sprites/largerobot_pk.dmi
Binary file not shown.
Binary file modified modular_zubbers/modules/borgs/sprites/largerobot_sec.dmi
Binary file not shown.
Binary file modified modular_zubbers/modules/borgs/sprites/largerobot_serv.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified modular_zubbers/modules/borgs/sprites/widerobot_mine.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 12f5a82

Please sign in to comment.