Skip to content
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.

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

Ramatae Rework (Another Word Starting With R) [NEEDS CONFIG UPDATE] #121

Merged
merged 6 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
1 change: 1 addition & 0 deletions code/__DEFINES/~doppler_defines/is_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
#define isinsectoid(A) (is_species(A, /datum/species/insectoid))
#define issnail(A) (is_species(A, /datum/species/snail))
#define ishemophage(A) (is_species(A, /datum/species/genemod/hemophage))
#define isramatan(A) (is_species(A, /datum/species/ramatan))
//Species with green blood
#define hasgreenblood(A) (isinsectoid(A) || issnail(A) || HAS_TRAIT(A, TRAIT_GREEN_BLOOD))
2 changes: 1 addition & 1 deletion code/__DEFINES/~doppler_defines/species.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define SPECIES_GENEMOD "genemod"
#define SPECIES_GENEMOD_PRIMITIVE "primitive_genemod"
#define SPECIES_SLUGCAT "slugcat"
#define SPECIES_RAMATAN "ramatan"
#define SPECIES_ANTHROMORPH "anthromorph"
#define SPECIES_AQUATIC "aquatic"
#define SPECIES_INSECTOID "insectoid"
Expand Down
2 changes: 1 addition & 1 deletion code/datums/emotes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@
*/
/datum/emote/proc/should_play_sound(mob/user, intentional = FALSE)
if(emote_type & EMOTE_AUDIBLE && !hands_use_check)
if(HAS_TRAIT(user, TRAIT_MUTE))
if(HAS_TRAIT(user, TRAIT_MUTE) && !isramatan(user))
Nerev4r marked this conversation as resolved.
Show resolved Hide resolved
return FALSE
if(ishuman(user))
var/mob/living/carbon/human/loud_mouth = user
Expand Down
2 changes: 1 addition & 1 deletion config/game_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ ROUNDSTART_RACES lizard
ROUNDSTART_RACES moth
ROUNDSTART_RACES plasmaman
#ROUNDSTART_RACES shadow
ROUNDSTART_RACES slugcat
ROUNDSTART_RACES ramatan
ROUNDSTART_RACES anthromorph
ROUNDSTART_RACES aquatic
ROUNDSTART_RACES insectoid
Expand Down
4 changes: 4 additions & 0 deletions modular_doppler/loadout_categories/categories/inhands.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,7 @@
/datum/loadout_item/inhand/slimpack
name = "Custom Flatpack"
item_path = /obj/item/storage/backpack/satchel/flat/empty/custom

/datum/loadout_item/inhand/translationgloves
name = "Translation Gloves"
item_path = /obj/item/clothing/gloves/radio
12 changes: 12 additions & 0 deletions modular_doppler/loadout_categories/categories/undersuit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@
name = "Camo Pants"
item_path = /obj/item/clothing/under/pants/camo

/datum/loadout_item/undersuit/pants/big_pants
name = "JUNCO megacargo pants"
item_path = /obj/item/clothing/under/pants/big_pants

/*
* BUTTONDOWNS
*/
Expand Down Expand Up @@ -163,3 +167,11 @@
/datum/loadout_item/undersuit/dress/strapless
name = "Strapless Dress"
item_path = /obj/item/clothing/under/dress/doppler/strapless

/*
* MISCELLANEOUS
*/

/datum/loadout_item/undersuit/gear_harness
name = "Gear Harness"
item_path = /obj/item/clothing/under/misc/gear_harness
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/obj/item/clothing
var/attachment_slot_override = NONE

/obj/item/clothing/accessory/can_attach_accessory(obj/item/clothing/clothing_item, mob/user)
if(!attachment_slot || (clothing_item?.attachment_slot_override & attachment_slot))
return TRUE
return ..()
16 changes: 16 additions & 0 deletions modular_doppler/modular_cosmetics/code/under/miscellania.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,19 @@
greyscale_colors = "#874f16"
flags_1 = IS_PLAYER_COLORABLE_1
alternate_worn_layer = LOW_FACEMASK_LAYER

/obj/item/clothing/under/misc/gear_harness
name = "gear harness"
desc = "A simple, inconspicuous harness replacement for a jumpsuit."
icon = 'modular_doppler/modular_cosmetics/icons/obj/under/miscellania.dmi'
worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/under/miscellania.dmi'
icon_state = "gear_harness"
body_parts_covered = NONE
attachment_slot_override = CHEST
can_adjust = FALSE
slot_flags = ITEM_SLOT_ICLOTHING | ITEM_SLOT_OCLOTHING
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/under/misc/gear_harness/Initialize(mapload)
. = ..()
allowed += GLOB.colonist_suit_allowed
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/datum/sprite_accessory/lizard_markings/slugcat
icon = 'modular_doppler/modular_customization/accessories/icons/slugcat/slugcat_markings.dmi'
name = "Slugcat Underbelly"
/datum/sprite_accessory/lizard_markings/ramatan
icon = 'modular_doppler/modular_customization/accessories/icons/ramatan/ramatan_markings.dmi'
name = "Ramatan Underbelly"
icon_state = "scug_lbelly"
gender_specific = TRUE
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/datum/sprite_accessory/frills/ramatan
icon = 'modular_doppler/modular_customization/accessories/icons/ramatan/ramatan_frills.dmi'
name = "Ramatan"
icon_state = "scug_aquatic"

/datum/sprite_accessory/frills/ramatan/sharp
name = "Ramatan Sharp"
icon_state = "scug_sharp"

/datum/sprite_accessory/frills/ramatan/fluffy
name = "Ramatan Fluffy"
icon_state = "scug_fluffy"

/datum/sprite_accessory/frills/ramatan/draconic
name = "Ramatan Draconic"
icon_state = "scug_dragon"
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/datum/sprite_accessory/horns/ramatan
icon = 'modular_doppler/modular_customization/accessories/icons/ramatan/ramatan_horns.dmi'
name = "Ramatan"
icon_state = "scug_standard"

/datum/sprite_accessory/horns/ramatan/tall
name = "Ramatan Tall"
icon_state = "scug_tall"

/datum/sprite_accessory/horns/ramatan/sharp
name = "Ramatan Sharp"
icon_state = "scug_sharp"

/datum/sprite_accessory/horns/ramatan/forward
name = "Ramatan Droopy"
icon_state = "scug_forward"

/datum/sprite_accessory/horns/ramatan/flopped
name = "Ramatan Long Flop"
icon_state = "scug_flopped"

/datum/sprite_accessory/horns/ramatan/fluffy
name = "Ramatan Fluffy"
icon_state = "scug_fluffy"

/datum/sprite_accessory/horns/ramatan/short
name = "Ramatan Short"
icon_state = "scug_short"
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/datum/sprite_accessory/snouts/ramatan
icon = 'modular_doppler/modular_customization/accessories/icons/ramatan/ramatan_snout.dmi'
name = "Ramatan"
icon_state = "scug_standard"

/datum/sprite_accessory/snouts/ramatan/sharp
name = "Ramatan Sharp"
icon_state = "scug_sharp"

/datum/sprite_accessory/snouts/ramatan/round
name = "Ramatan Round"
icon_state = "scug_round"
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/datum/sprite_accessory/tails/lizard/ramatan
icon = 'modular_doppler/modular_customization/accessories/icons/ramatan/ramatan_tail.dmi'
name = "Ramatan"
icon_state = "scug_std"

/datum/sprite_accessory/tails/lizard/ramatan/thick
name = "Ramatan Thick"
icon_state = "scug_thick"

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// If you need to make edits to existing bodyparts, do so in here.
/obj/item/bodypart/head
/// Override of the eyes icon file - used for slugcats as test dummies, followed by teshies, vox, possibly moths & insects, and more!
/// Override of the eyes icon file - used for ramatae as test dummies, followed by teshies, vox, possibly moths & insects, and more!
var/eyes_icon

/obj/item/bodypart/head/lizard
Expand Down
Binary file not shown.
Loading
Loading