Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
Slavik2001 committed Nov 15, 2024
1 parent 7631c56 commit 829244a
Show file tree
Hide file tree
Showing 10 changed files with 102 additions and 4 deletions.
4 changes: 4 additions & 0 deletions code/__DEFINES/mob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@
#define ZOMBIE_SKRELL "Zombie Skrell"
#define ZOMBIE_UNATHI "Zombie Unathi"
#define SLIME "Slime"
#define SLIME_UNATHI "Slime Unathi"
#define SLIME_VOX "Slime Vox"
#define SLIME_TAJARAN "Slime Tajaran"
#define SLIME_SKRELL "Slime Skrell"
#define ABOMINATION "disgusting abomination"
#define SERPENTID "Serpentid"
#define MOTH "Moth"
Expand Down
85 changes: 82 additions & 3 deletions code/modules/mob/living/carbon/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1744,13 +1744,14 @@

/datum/species/slime
name = SLIME
icobase = 'icons/mob/human_races/r_slime.dmi'
deform = 'icons/mob/human_races/r_slime.dmi'
icobase = 'icons/mob/human_races/r_human_slime.dmi'
deform = 'icons/mob/human_races/r_human_slime.dmi'

blood_datum_path = /datum/dirt_cover/blue_blood
flesh_color = "#05fffb"
unarmed_type = /datum/unarmed_attack/slime_glomp
has_gendered_icons = FALSE
has_gendered_icons = TRUE
gender_limb_icons = TRUE

cold_level_1 = BODYTEMP_COLD_DAMAGE_LIMIT + 20
cold_level_2 = BODYTEMP_COLD_DAMAGE_LIMIT - 10
Expand All @@ -1774,6 +1775,84 @@

is_common = TRUE

/datum/species/slime/unathi
name = SLIME_UNATHI
icobase = 'icons/mob/human_races/r_lizard_slime.dmi'
deform = 'icons/mob/human_races/r_lizard_slime.dmi'
gender_tail_icons = TRUE
tail = "unathi_slime"

flags = list(
NO_BREATHE = TRUE
,NO_SCAN = TRUE
,NO_PAIN = TRUE
,HAS_SKIN_COLOR = TRUE
,HAS_UNDERWEAR = TRUE
,RAD_IMMUNE = TRUE
,VIRUS_IMMUNE = TRUE
,IS_SOCIAL = TRUE
,HAS_TAIL = TRUE
)

/datum/species/slime/vox
name = SLIME_VOX
icobase = 'icons/mob/human_races/r_vox_slime.dmi'
deform = 'icons/mob/human_races/r_vox_slime.dmi'
has_gendered_icons = FALSE
gender_limb_icons = FALSE
tail = "vox_slime"
eyes = "vox_eyes"

flags = list(
NO_BREATHE = TRUE
,NO_SCAN = TRUE
,NO_PAIN = TRUE
,HAS_SKIN_COLOR = TRUE
,RAD_IMMUNE = TRUE
,VIRUS_IMMUNE = TRUE
,IS_SOCIAL = TRUE
,HAS_TAIL = TRUE
)

sprite_sheets = list(
// SPRITE_SHEET_HELD = 'icons/mob/species/vox/held.dmi',
SPRITE_SHEET_UNIFORM = 'icons/mob/species/vox/uniform.dmi',
SPRITE_SHEET_SUIT = 'icons/mob/species/vox/suit.dmi',
SPRITE_SHEET_BELT = 'icons/mob/belt.dmi',
SPRITE_SHEET_HEAD = 'icons/mob/species/vox/helmet.dmi',
SPRITE_SHEET_MASK = 'icons/mob/species/vox/masks.dmi',
SPRITE_SHEET_EYES = 'icons/mob/species/vox/eyes.dmi',
SPRITE_SHEET_FEET = 'icons/mob/species/vox/shoes.dmi',
SPRITE_SHEET_GLOVES = 'icons/mob/species/vox/gloves.dmi',
SPRITE_SHEET_BACK = 'icons/mob/species/vox/back.dmi'
)

/datum/species/slime/tajaran
name = SLIME_TAJARAN
icobase = 'icons/mob/human_races/r_tajaran_slime.dmi'
deform = 'icons/mob/human_races/r_tajaran_slime.dmi'
gender_tail_icons = TRUE
tail = "tajaran_slime"

flags = list(
NO_BREATHE = TRUE
,NO_SCAN = TRUE
,NO_PAIN = TRUE
,HAS_SKIN_COLOR = TRUE
,HAS_UNDERWEAR = TRUE
,RAD_IMMUNE = TRUE
,VIRUS_IMMUNE = TRUE
,IS_SOCIAL = TRUE
,HAS_TAIL = TRUE
)

/datum/species/slime/skrell
name = SLIME_SKRELL
icobase = 'icons/mob/human_races/r_skrell_slime.dmi'
deform = 'icons/mob/human_races/r_skrell_slime.dmi'
has_gendered_icons = FALSE
gender_limb_icons = FALSE

/datum/species/slime/call_digest_proc(mob/living/M, datum/reagent/R)
return R.on_slime_digest(M)

Expand Down
17 changes: 16 additions & 1 deletion code/modules/reagents/reagent_types/Chemistry-Toxic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -763,13 +763,28 @@
to_chat(H, "<span class='warning'>You feel unbearable pain inside you!</span>")
H.emote("scream")
if(30)
if(H.set_species(SLIME))
var/slime_species
switch(H.species.name)
if("Unathi")
slime_species = SLIME_UNATHI
if("Vox")
slime_species = SLIME_VOX
if("Tajaran")
slime_species = SLIME_TAJARAN
if("Skrell")
slime_species = SLIME_SKRELL
else
slime_species = SLIME
if(H.set_species(slime_species))
to_chat(H, "<span class='warning'>Your flesh mutates and you feel free!</span>")
for(var/obj/item/organ/external/BP in H.bodyparts)
BP.status = 0
for(var/obj/item/organ/internal/BP in H.organs)
BP.rejuvenate()
H.restore_blood()
H.h_style = "Bald"
H.f_style = "Shaved"
H.update_hair()
if(31 to 50)
M.heal_bodypart_damage(0,5)
M.adjustOxyLoss(-2 * REM)
Expand Down
Binary file added icons/mob/human_races/r_human_slime.dmi
Binary file not shown.
Binary file added icons/mob/human_races/r_lizard_slime.dmi
Binary file not shown.
Binary file added icons/mob/human_races/r_skrell_slime.dmi
Binary file not shown.
Binary file removed icons/mob/human_races/r_slime.dmi
Binary file not shown.
Binary file added icons/mob/human_races/r_tajaran_slime.dmi
Binary file not shown.
Binary file added icons/mob/human_races/r_vox_slime.dmi
Binary file not shown.
Binary file modified icons/mob/species/tail.dmi
Binary file not shown.

0 comments on commit 829244a

Please sign in to comment.