cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 13:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Smolraptor Updates (#3456)

Browse Source 
## About The Pull Request
Adds blue and red sec smolraptors, makes janitor an alt of service


![Screenshot_50](https://github.com/user-attachments/assets/a5be3ed8-75da-4939-937c-0261dfcb1953)

## Proof Of Testing
it works

## Changelog

🆑
add: sec smolraptors
image: fixes some errors in smolraptors
/🆑
This commit is contained in:
aKromatopzia
2025-04-11 03:02:38 -06:00
committed by GitHub
parent 7c0978a47f
commit 29b3c8daba
9 changed files with 56 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/~~bubber_defines/robot_defines.dm
+2 -1
View File
@@ -96,6 +96,7 @@
// SMOLRAPTOR BORG DEFINES BELOW
#define CYBORG_ICON_TYPE_SMOLRAPTOR "smolraptor"
#define CYBORG_ICON_TYPE_SMOLRAPTOR_ALT "smolraptor_alt"
#define CYBORG_ICON_GEN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_gen.dmi'
#define CYBORG_ICON_SCI_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_sci.dmi'
@@ -104,7 +105,7 @@
#define CYBORG_ICON_CAR_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_car.dmi'
#define CYBORG_ICON_SERV_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_serv.dmi'
#define CYBORG_ICON_PK_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_pk.dmi'
#define CYBORG_ICON_JANI_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_jani.dmi'
#define CYBORG_ICON_SEC_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_sec.dmi'
#define CYBORG_ICON_MIN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_min.dmi'
#define CYBORG_ICON_CC_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_cc.dmi'
#define CYBORG_ICON_SYN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_syndie.dmi'
modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm
+54 -34
View File
@@ -385,8 +385,8 @@
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
RAPTOR_HAT_OFFSET
),
"SmolRaptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR,
SKIN_ICON = CYBORG_ICON_JANI_SMOLRAPTOR,
"SmolRaptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR_ALT,
SKIN_ICON = CYBORG_ICON_SERV_SMOLRAPTOR,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE),
SMOL_RAPTOR_HAT_OFFSET
),
@@ -501,6 +501,18 @@
SKIN_ICON = CYBORG_ICON_SEC_CATBORG,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
),
"SmolRaptor" = list(
SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR,
SKIN_ICON = CYBORG_ICON_SEC_SMOLRAPTOR,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE),
SMOL_RAPTOR_HAT_OFFSET
),
"SmolRaptor BLU" = list(
SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR_ALT,
SKIN_ICON = CYBORG_ICON_SEC_SMOLRAPTOR,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE),
SMOL_RAPTOR_HAT_OFFSET
),
//32x64 Sprites below (Tall)
"Meka - Bluesec" = list(
SKIN_ICON_STATE = "mekasecalt",
@@ -559,10 +571,11 @@
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
RAPTOR_HAT_OFFSET
),
"SmolRaptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR,
SKIN_ICON = CYBORG_ICON_PK_SMOLRAPTOR,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE),
SMOL_RAPTOR_HAT_OFFSET
"SmolRaptor" = list(
SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR,
SKIN_ICON = CYBORG_ICON_PK_SMOLRAPTOR,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE),
SMOL_RAPTOR_HAT_OFFSET
),
"Dullahan" = list(
SKIN_ICON_STATE = "dullahanpeace",
@@ -609,10 +622,11 @@
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
RAPTOR_HAT_OFFSET
),
"SmolRaptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR,
SKIN_ICON = CYBORG_ICON_SERV_SMOLRAPTOR,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE),
SMOL_RAPTOR_HAT_OFFSET
"SmolRaptor" = list(
SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR,
SKIN_ICON = CYBORG_ICON_SERV_SMOLRAPTOR,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE),
SMOL_RAPTOR_HAT_OFFSET
),
"Dullahan" = list(
SKIN_ICON_STATE = "dullahanserv",
@@ -749,10 +763,11 @@
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
HOUND_HAT_OFFSET
),
"SmolRaptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR,
SKIN_ICON = CYBORG_ICON_SYN_SMOLRAPTOR,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE),
SMOL_RAPTOR_HAT_OFFSET
"SmolRaptor" = list(
SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR,
SKIN_ICON = CYBORG_ICON_SYN_SMOLRAPTOR,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE),
SMOL_RAPTOR_HAT_OFFSET
),
"Dragon" = list(
SKIN_ICON_STATE = "dragon-syndi",
@@ -801,10 +816,11 @@
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
HOUND_HAT_OFFSET
),
"SmolRaptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR,
SKIN_ICON = CYBORG_ICON_SYN_SMOLRAPTOR,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE),
SMOL_RAPTOR_HAT_OFFSET
"SmolRaptor" = list(
SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR,
SKIN_ICON = CYBORG_ICON_SYN_SMOLRAPTOR,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE),
SMOL_RAPTOR_HAT_OFFSET
),
"Dragon" = list(
SKIN_ICON_STATE = "dragon-syndi",
@@ -855,10 +871,11 @@
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
HOUND_HAT_OFFSET
),
"SmolRaptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR,
SKIN_ICON = CYBORG_ICON_SYN_SMOLRAPTOR,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE),
SMOL_RAPTOR_HAT_OFFSET
"SmolRaptor" = list(
SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR,
SKIN_ICON = CYBORG_ICON_SYN_SMOLRAPTOR,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE),
SMOL_RAPTOR_HAT_OFFSET
),
"Dragon" = list(
SKIN_ICON_STATE = "dragon-syndi",
@@ -904,10 +921,11 @@
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
HOUND_HAT_OFFSET
),
"SmolRaptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR,
SKIN_ICON = CYBORG_ICON_SYN_SMOLRAPTOR,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE),
SMOL_RAPTOR_HAT_OFFSET
"SmolRaptor" = list(
SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR,
SKIN_ICON = CYBORG_ICON_SYN_SMOLRAPTOR,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE),
SMOL_RAPTOR_HAT_OFFSET
),
"Dragon" = list(
SKIN_ICON_STATE = "dragon-syndi",
@@ -945,10 +963,11 @@
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL),
DULLAHAN_HAT_OFFSET
),
"SmolRaptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR,
SKIN_ICON = CYBORG_ICON_NIN_SMOLRAPTOR,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE),
SMOL_RAPTOR_HAT_OFFSET
"SmolRaptor" = list(
SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR,
SKIN_ICON = CYBORG_ICON_NIN_SMOLRAPTOR,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE),
SMOL_RAPTOR_HAT_OFFSET
),
"Dragon" = list(
SKIN_ICON_STATE = "dragon-ninja",
@@ -967,10 +986,11 @@
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL),
F3LINE_HAT_OFFSET
),
"SmolRaptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR,
SKIN_ICON = CYBORG_ICON_NIN_SMOLRAPTOR,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE),
SMOL_RAPTOR_HAT_OFFSET
"SmolRaptor" = list(
SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR,
SKIN_ICON = CYBORG_ICON_NIN_SMOLRAPTOR,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE),
SMOL_RAPTOR_HAT_OFFSET
),
"Dragon" = list(
SKIN_ICON_STATE = "dragon-ninja",
modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_cc.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_jani.dmi
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_min.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_ninja.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_sec.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_serv.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 25 KiB

modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_syndie.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 14 KiB