Skip to content

Boxerrevival #1

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

Merged
Lagomorphica merged 11 commits into from
Apr 3, 2025
Merged

Boxerrevival #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 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
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
3 changes: 3 additions & 0 deletions code/__DEFINES/xeno.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,9 @@
// Lurker strain flags
#define LURKER_VAMPIRE "Vampire"

// Warrior strain flags
#define WARRIOR_BOXER "Boxer"

// Ravager strain flags
#define RAVAGER_HEDGEHOG "Hedgehog"
#define RAVAGER_BERSERKER "Berserker"
Expand Down
4 changes: 4 additions & 0 deletions code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@

minimap_icon = "warrior"

available_strains = list(
/datum/xeno_strain/boxer,
)

/mob/living/carbon/xenomorph/warrior
caste_type = XENO_CASTE_WARRIOR
name = XENO_CASTE_WARRIOR
Expand Down
Loading