Skip to content

Adds Yuji Itadori to CM #12015

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

Open
Mister-moon1 wants to merge 26 commits into
base: master
Choose a base branch
from
+593 −11
Open

Adds Yuji Itadori to CM #12015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
d68acd5
first
Mar 19, 2025
dd24ab6
ok
Mar 19, 2025
48cb7a7
ko works and text stuff
Mar 19, 2025
a01d908
ok.
Mar 19, 2025
b9b489f
indent and before the whitespace police arrive
Mar 25, 2025
8ed6148
comma
Mar 25, 2025
c536f8a
Merge branch 'master' into boxerrevival
Red-byte3D Mar 27, 2025
f19db71
stun removl
Mar 30, 2025
b24ec61
Merge branch 'boxerrevival' of https://github.com/Red-byte3D/cmss13 i…
Mar 30, 2025
911308b
fixes
Apr 1, 2025
e0edc58
fixa
Apr 2, 2025
a419d0c
Merge pull request #1 from Red-byte3D/boxerrevival
psyendrocronologicalwarfare Apr 3, 2025
05de225
Merge branch 'master' into boxerino
psyendrocronologicalwarfare Apr 3, 2025
3887c80
Merge pull request #1 from psyendrocronologicalwarfare/boxerino
Mister-moon1 Mar 22, 2026
d3ad211
yes
Mister-moon1 Mar 22, 2026
879313f
fix
Mister-moon1 Mar 22, 2026
df022c0
Add files via upload
Mister-moon1 Mar 22, 2026
5720c6f
Add files via upload
Mister-moon1 Mar 22, 2026
dc492c0
fix
Mister-moon1 Mar 22, 2026
0d4b6f1
fix for real
Mister-moon1 Mar 22, 2026
c1a62a7
YUJI BUT A CASTE
Mister-moon1 Mar 27, 2026
17e18a3
yuji but its own caste now
Mister-moon1 Mar 27, 2026
3685737
howareyougoingtobeyujiwithouttalkinglikehim
Mister-moon1 Mar 27, 2026
131a18c
actually remember to fix lints
Mister-moon1 Mar 27, 2026
7bfd497
blowuptheworld
Mister-moon1 Mar 27, 2026
c39a50a
i forgot damage sprites
Mister-moon1 Mar 27, 2026
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
5 changes: 3 additions & 2 deletions code/__DEFINES/xeno.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,8 +682,9 @@
#define XENO_CASTE_HIVELORD "Hivelord"
#define XENO_CASTE_LURKER "Lurker"
#define XENO_CASTE_WARRIOR "Warrior"
#define XENO_CASTE_BOXER "Yuji Itadori"
#define XENO_CASTE_SPITTER "Spitter"
#define XENO_T2_CASTES list(XENO_CASTE_BURROWER, XENO_CASTE_CARRIER, XENO_CASTE_HIVELORD, XENO_CASTE_LURKER, XENO_CASTE_WARRIOR, XENO_CASTE_SPITTER)
#define XENO_T2_CASTES list(XENO_CASTE_BURROWER, XENO_CASTE_CARRIER, XENO_CASTE_HIVELORD, XENO_CASTE_LURKER, XENO_CASTE_WARRIOR, XENO_CASTE_BOXER, XENO_CASTE_SPITTER)
//t3
#define XENO_CASTE_BOILER "Boiler"
#define XENO_CASTE_PRAETORIAN "Praetorian"
Expand All @@ -704,7 +705,7 @@
//caste list
#define XENO_CONSTRUCT_NODE_BOOST list(XENO_CASTE_HIVELORD, XENO_CASTE_BURROWER, XENO_CASTE_CARRIER, XENO_CASTE_QUEEN)

#define ALL_XENO_CASTES list(XENO_CASTE_LARVA, XENO_CASTE_PREDALIEN_LARVA, XENO_CASTE_FACEHUGGER, XENO_CASTE_LESSER_DRONE, XENO_CASTE_DRONE, XENO_CASTE_RUNNER, XENO_CASTE_SENTINEL, XENO_CASTE_DEFENDER, XENO_CASTE_BURROWER, XENO_CASTE_CARRIER, XENO_CASTE_HIVELORD, XENO_CASTE_LURKER, XENO_CASTE_WARRIOR, XENO_CASTE_SPITTER, XENO_CASTE_BOILER, XENO_CASTE_DESPOILER, XENO_CASTE_PRAETORIAN, XENO_CASTE_CRUSHER, XENO_CASTE_RAVAGER, XENO_CASTE_QUEEN, XENO_CASTE_PREDALIEN, XENO_CASTE_HELLHOUND, XENO_CASTE_KING)
#define ALL_XENO_CASTES list(XENO_CASTE_LARVA, XENO_CASTE_PREDALIEN_LARVA, XENO_CASTE_FACEHUGGER, XENO_CASTE_LESSER_DRONE, XENO_CASTE_DRONE, XENO_CASTE_RUNNER, XENO_CASTE_SENTINEL, XENO_CASTE_DEFENDER, XENO_CASTE_BURROWER, XENO_CASTE_CARRIER, XENO_CASTE_HIVELORD, XENO_CASTE_LURKER, XENO_CASTE_WARRIOR, XENO_CASTE_BOXER, XENO_CASTE_SPITTER, XENO_CASTE_BOILER, XENO_CASTE_DESPOILER, XENO_CASTE_PRAETORIAN, XENO_CASTE_CRUSHER, XENO_CASTE_RAVAGER, XENO_CASTE_QUEEN, XENO_CASTE_PREDALIEN, XENO_CASTE_HELLHOUND, XENO_CASTE_KING)

// Checks if two hives are allied to each other.
// PARAMETERS:
Expand Down
1 change: 1 addition & 0 deletions code/datums/langchat/langchat.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
/mob/living/carbon/xenomorph/hivelord/langchat_height = 64
/mob/living/carbon/xenomorph/defender/langchat_height = 48
/mob/living/carbon/xenomorph/warrior/langchat_height = 48
/mob/living/carbon/xenomorph/boxer/langchat_height = 48
/mob/living/carbon/xenomorph/king/langchat_height = 64
/mob/living/carbon/xenomorph/despoiler/langchat_height = 64

Expand Down
2 changes: 2 additions & 0 deletions code/game/jobs/role_authority.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,8 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
M = /mob/living/carbon/xenomorph/lurker
if(XENO_CASTE_WARRIOR)
M = /mob/living/carbon/xenomorph/warrior
if(XENO_CASTE_BOXER)
M = /mob/living/carbon/xenomorph/boxer
if(XENO_CASTE_DEFENDER)
M = /mob/living/carbon/xenomorph/defender
if(XENO_CASTE_QUEEN)
Expand Down
2 changes: 2 additions & 0 deletions code/game/sound.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,8 @@
sound = pick('sound/voice/alien_roar_larva1.ogg','sound/voice/alien_roar_larva2.ogg')
if("queen")
sound = pick('sound/voice/alien_queen_command.ogg','sound/voice/alien_queen_command2.ogg','sound/voice/alien_queen_command3.ogg')
if("yuji_talk")
sound = pick ('sound/voice/yuji_talk.ogg', 'sound/voice/yuji_talk2.ogg', 'sound/voice/yuji_talk3.ogg',)
// Human
if("male_scream")
sound = pick('sound/voice/human_male_scream_1.ogg','sound/voice/human_male_scream_2.ogg','sound/voice/human_male_scream_3.ogg','sound/voice/human_male_scream_4.ogg',5;'sound/voice/human_male_scream_5.ogg',5;'sound/voice/human_jackson_scream.ogg',5;'sound/voice/human_ack_scream.ogg','sound/voice/human_male_scream_6.ogg')
Expand Down
5 changes: 5 additions & 0 deletions code/modules/admin/player_panel/actions/transform.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ GLOBAL_LIST_INIT(pp_transformables, list(
color = "purple"
),
list(
name = XENO_CASTE_BOXER,
key = /mob/living/carbon/xenomorph/boxer,
color = "purple"
),
list(
name = XENO_CASTE_SPITTER,
key = /mob/living/carbon/xenomorph/spitter,
color = "purple"
Expand Down
Loading
Loading