forked from SierraBay/SierraBay12
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
2083636
commit b57f771
Showing
54 changed files
with
226 additions
and
227 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
20 changes: 10 additions & 10 deletions
20
mods/resomi_fd/code/body/emotes.dm → mods/_fd/resomi_fd/code/body/emotes.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,51 +1,51 @@ | ||
| // RESOMI EMOTIONS | ||
|
|
||
| /singleton/emote/audible/chuckle/resomi | ||
| emote_sound = 'mods/resomi_fd/sound/resomilaugh.ogg' | ||
| emote_sound = 'mods/_fd/resomi_fd/sound/resomilaugh.ogg' | ||
| sounded_species = null | ||
|
|
||
| /singleton/emote/audible/cough/resomi | ||
| emote_sound = 'mods/resomi_fd/sound/resomicough.ogg' | ||
| emote_sound = 'mods/_fd/resomi_fd/sound/resomicough.ogg' | ||
| sounded_species = null | ||
|
|
||
| /singleton/emote/audible/laugh/resomi | ||
| emote_sound = 'mods/resomi_fd/sound/resomilaugh.ogg' | ||
| emote_sound = 'mods/_fd/resomi_fd/sound/resomilaugh.ogg' | ||
| sounded_species = null | ||
|
|
||
| /singleton/emote/audible/scream/resomi | ||
| emote_sound = 'mods/resomi_fd/sound/resomiscream.ogg' | ||
| emote_sound = 'mods/_fd/resomi_fd/sound/resomiscream.ogg' | ||
| sounded_species = null | ||
|
|
||
| /singleton/emote/audible/sneeze/resomi | ||
| emote_sound = 'mods/resomi_fd/sound/resomisneeze.ogg' | ||
| emote_sound = 'mods/_fd/resomi_fd/sound/resomisneeze.ogg' | ||
| sounded_species = null | ||
|
|
||
| /singleton/emote/audible/peep/resomi | ||
| key = "peep" | ||
| emote_message_3p = "USER пищит" | ||
| emote_sound = 'mods/resomi_fd/sound/peep.ogg' | ||
| emote_sound = 'mods/_fd/resomi_fd/sound/peep.ogg' | ||
| sounded_species = null | ||
|
|
||
| /singleton/emote/audible/rustle/resomi | ||
| key = "rustle" | ||
| emote_message_3p = "USER шелестит крыльями" | ||
| emote_sound = 'mods/resomi_fd/sound/rustle.ogg' | ||
| emote_sound = 'mods/_fd/resomi_fd/sound/rustle.ogg' | ||
| sounded_species = null | ||
|
|
||
| /singleton/emote/audible/trill/resomi | ||
| key = "trill" | ||
| emote_message_3p = "USER издаёт трель" | ||
| emote_sound = 'mods/resomi_fd/sound/trill.ogg' | ||
| emote_sound = 'mods/_fd/resomi_fd/sound/trill.ogg' | ||
| sounded_species = null | ||
|
|
||
| /singleton/emote/audible/warble/resomi | ||
| key = "warble" | ||
| emote_message_3p = "USER издаёт трель" | ||
| emote_sound = 'mods/resomi_fd/sound/warble.ogg' | ||
| emote_sound = 'mods/_fd/resomi_fd/sound/warble.ogg' | ||
| sounded_species = null | ||
|
|
||
| /singleton/emote/audible/wurble/resomi | ||
| key = "wurble" | ||
| emote_message_3p = "USER урчит" | ||
| emote_sound = 'mods/resomi_fd/sound/wurble.ogg' | ||
| emote_sound = 'mods/_fd/resomi_fd/sound/wurble.ogg' | ||
| sounded_species = null |
2 changes: 1 addition & 1 deletion
2
mods/resomi_fd/code/body/holding.dm → mods/_fd/resomi_fd/code/body/holding.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,191 @@ | ||
|
|
||
|
|
||
| //Shoes | ||
|
|
||
| /obj/item/clothing/shoes/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_feet_resomi.dmi') | ||
| LAZYSET(sprite_sheets_obj, SPECIES_RESOMI, 'packs/infinity/icons/obj/clothing/species/resomi/obj_feet_resomi.dmi') | ||
|
|
||
| //Gloves | ||
| /obj/item/clothing/gloves/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_hands_resomi.dmi') | ||
|
|
||
|
|
||
| //suit | ||
| /obj/item/clothing/suit/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_suit_resomi.dmi') | ||
| LAZYSET(sprite_sheets_obj, SPECIES_RESOMI, 'packs/infinity/icons/obj/clothing/species/resomi/obj_suit_resomi.dmi') | ||
|
|
||
| //rig | ||
| /obj/item/rig/eva/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi') | ||
|
|
||
| /obj/item/rig/light/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi') | ||
|
|
||
| /obj/item/rig/medical/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi') | ||
|
|
||
| /obj/item/rig/hazard/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi') | ||
|
|
||
| /obj/item/rig/combat/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi') | ||
|
|
||
| /obj/item/rig/merc/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi') | ||
|
|
||
| /obj/item/rig/zero/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi') | ||
|
|
||
| /obj/item/rig/ce/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi') | ||
|
|
||
| /obj/item/rig/industrial/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi') | ||
|
|
||
| /obj/item/rig/hazmat/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi') | ||
|
|
||
| /obj/item/rig/ert/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi') | ||
|
|
||
| /obj/item/rig/command/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi') | ||
|
|
||
|
|
||
| /* | ||
| /obj/item/clothing/head/helmet/space/rig/Initialize() | ||
| . = ..() | ||
| LAZYADD(species_restricted, list(SPECIES_RESOMI)) | ||
| /obj/item/clothing/gloves/rig/Initialize() | ||
| . = ..() | ||
| LAZYADD(species_restricted, list(SPECIES_RESOMI)) | ||
| /obj/item/clothing/shoes/magboots/rig/Initialize() | ||
| . = ..() | ||
| LAZYADD(species_restricted, list(SPECIES_RESOMI)) | ||
| /obj/item/clothing/suit/space/rig/Initialize() | ||
| . = ..() | ||
| LAZYADD(species_restricted, list(SPECIES_RESOMI)) | ||
| */ | ||
|
|
||
|
|
||
| /obj/item/storage/belt/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_belt_resomi.dmi') | ||
|
|
||
| /obj/item/clothing/accessory/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_accessories_resomi.dmi') | ||
| LAZYSET(sprite_sheets_obj, SPECIES_RESOMI, 'packs/infinity/icons/obj/clothing/species/resomi/obj_accessories_resomi.dmi') | ||
| // back | ||
| /obj/item/storage/backpack/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_back_resomi.dmi') | ||
|
|
||
| // under | ||
| /obj/item/clothing/under/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_under_resomi.dmi') | ||
| LAZYSET(sprite_sheets_obj, SPECIES_RESOMI, 'packs/infinity/icons/obj/clothing/species/resomi/obj_under_resomi.dmi') | ||
| //ears | ||
| /obj/item/clothing/ears/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_ears_resomi.dmi') | ||
|
|
||
| //mask | ||
| /obj/item/clothing/mask/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_mask_resomi.dmi') | ||
|
|
||
| //head | ||
| /obj/item/clothing/head/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_head_resomi.dmi') | ||
| LAZYSET(sprite_sheets_obj, SPECIES_RESOMI, 'packs/infinity/icons/obj/clothing/species/resomi/obj_head_resomi.dmi') | ||
|
|
||
| /obj/item/clothing/head/beret/Initialize() | ||
| . = ..() | ||
| LAZYSET(base_sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_head_resomi.dmi') | ||
|
|
||
| //glasses | ||
| /obj/item/clothing/glasses/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_eyes_resomi.dmi') | ||
| LAZYSET(sprite_sheets_obj, SPECIES_RESOMI, 'packs/infinity/icons/obj/clothing/species/resomi/obj_eyes_resomi.dmi') | ||
|
|
||
| //devices and machines | ||
| /obj/machinery/suit_cycler/Initialize() | ||
| . = ..() | ||
| species += SPECIES_RESOMI | ||
|
|
||
| /obj/item/auto_cpr/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_suit_resomi.dmi') | ||
|
|
||
| /obj/item/device/radio/headset/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_ears_resomi.dmi') | ||
|
|
||
| /obj/item/clothing/mask/plunger/equipped(M, slot) | ||
| ..() | ||
| sprite_sheets[SPECIES_RESOMI] = (slot == slot_head ? 'mods/_fd/resomi_fd/icons/clothing/onmob_head_resomi.dmi' : 'mods/_fd/resomi_fd/icons/clothing/onmob_mask_resomi.dmi') | ||
|
|
||
| /obj/item/card/id/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_id_resomi.dmi') | ||
|
|
||
| /obj/item/handcuffs/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/misc.dmi') | ||
|
|
||
| /obj/item/storage/belt/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_belt_resomi.dmi') | ||
|
|
||
| /obj/item/tank/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_back_resomi.dmi') | ||
|
|
||
| /obj/item/towel/equipped(M, slot) | ||
| ..() | ||
| sprite_sheets = list(SPECIES_RESOMI = (slot == slot_head ? 'mods/_fd/resomi_fd/icons/clothing/onmob_head_resomi.dmi' : 'mods/_fd/resomi_fd/icons/clothing/onmob_suit_resomi.dmi')) | ||
|
|
||
| /obj/item/clothing/under/solgov/utility/expeditionary/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/solgov/onmob_under_resomi.dmi') | ||
|
|
||
| /obj/item/clothing/accessory/solgov/department/Initialize() | ||
| . = ..() | ||
| LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/solgov/onmob_accessories_resomi.dmi') | ||
|
|
||
| // | ||
| #define SETUP_SPECIES_ONMOB "sprite_sheets" | ||
|
|
||
| /singleton/item_modifier/space_suit/Initialize() | ||
| . = ..() | ||
| var/helmet_setup = type_setups[/obj/item/clothing/head/helmet/space] | ||
| helmet_setup[SETUP_SPECIES_ONMOB] += list(SPECIES_RESOMI = 'mods/_fd/resomi_fd/icons/clothing/onmob_head_resomi.dmi') | ||
|
|
||
| var/suit_setup = type_setups[/obj/item/clothing/suit/space/void] | ||
| suit_setup[SETUP_SPECIES_ONMOB] += list(SPECIES_RESOMI = 'mods/_fd/resomi_fd/icons/clothing/onmob_suit_resomi.dmi') | ||
|
|
||
| #undef SETUP_SPECIES_ONMOB |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.