Skip to content

Commit

Permalink
Moffers (ss220club#1412)
Browse files Browse the repository at this point in the history
## Что этот PR делает
Портирует с ТГ мофферсы, добавляет им крафт путём убийства молей и
добавляет в качестве контрабанды в вендор ботинок.

## Почему это хорошо для игры
Смешные ботинки для клоуна

## Изображения изменений

![image](https://github.com/user-attachments/assets/abfaa306-b176-4bea-ab20-1de8707d1006)

![image](https://github.com/user-attachments/assets/4856b046-7710-4069-9bf2-a923b4eb9927)

![image](https://github.com/user-attachments/assets/01e0e7f0-3086-47df-aa18-059dfa66fcec)

![image](https://github.com/user-attachments/assets/9094acfe-31cd-48e1-bd82-12522745f0f3)

![image](https://github.com/user-attachments/assets/b4678546-5520-4751-96c4-9e87f4d10e16)

## Тестирование
Локалочка

## Changelog
:cl:
add: В игру добавлены мофферсы - ботинки клоуна, которые жужжат при
ходьбе.
add: При разделывании личинки Ниан теперь будет выпадать шкура моли
add: В раздатчик ботинок были добавлены мофферсы при взломе 
/:cl:

---------

Co-authored-by: Gaxeer <[email protected]>
  • Loading branch information
Chorden523 and Gaxeer authored Aug 2, 2024
1 parent d91c8c1 commit e5a30bc
Show file tree
Hide file tree
Showing 13 changed files with 65 additions and 0 deletions.
50 changes: 50 additions & 0 deletions modular_ss220/clothing/code/shoes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,53 @@
/obj/item/clothing/shoes/shark/light
name = "светло-голубые акульи тапочки"
icon_state = "shark_light"

/obj/item/clothing/shoes/clown_shoes/moffers
name = "moffers"
desc = "Ни одна моль не пострадала во время создания этих ботинок."
icon = 'modular_ss220/clothing/icons/object/shoes.dmi'
lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
icon_state = "moffers"
item_state = "moffers"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Tajaran" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Kidan" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Skrell" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Nucleation" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Skeleton" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Slime People" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Unathi" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Grey" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Abductor" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Golem" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Machine" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Diona" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Nian" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Shadow" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Golem" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/shoes.dmi',
"Drask" = 'modular_ss220/clothing/icons/mob/species/drask/shoes.dmi',
)

/obj/item/clothing/shoes/clown_shoes/moffers/Initialize(mapload)
. = ..()
AddComponent(/datum/component/squeak, list('modular_ss220/clothing/sounds/moffstep01.ogg' = 1), 50, falloff_exponent = 20)

/datum/crafting_recipe/moffers
name = "Moffers"
reqs = list(
/obj/item/clothing/shoes/clown_shoes = 1,
/obj/item/stack/sheet/animalhide/mothroach = 2,
)
result = list(/obj/item/clothing/shoes/clown_shoes/moffers = 1)
blacklist = list(
/obj/item/clothing/shoes/clown_shoes/false_cluwne_shoes,
/obj/item/clothing/shoes/clown_shoes/magical,
/obj/item/clothing/shoes/clown_shoes/moffers,
/obj/item/clothing/shoes/clown_shoes/nodrop,
/obj/item/clothing/shoes/clown_shoes/slippers,
)
category = CAT_CLOTHING
Binary file modified modular_ss220/clothing/icons/inhands/left_hand.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/inhands/right_hand.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/shoes.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/shoes.dmi
Binary file not shown.
Binary file added modular_ss220/clothing/sounds/moffstep01.ogg
Binary file not shown.
4 changes: 4 additions & 0 deletions modular_ss220/mobs/code/simple_animal/friendly/moth.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@
butcher_results = list(/obj/item/food/monstermeat/xenomeat = 1)
gold_core_spawnable = FRIENDLY_SPAWN
holder_type = /obj/item/holder/moth

/mob/living/simple_animal/nian_caterpillar/Initialize()
. = ..()
butcher_results |= list(/obj/item/stack/sheet/animalhide/mothroach = 1)
1 change: 1 addition & 0 deletions modular_ss220/objects/_objects.dme
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@
#include "code/material_pouch.dm"
#include "code/components.dm"
#include "code/airlock_painter.dm"
#include "code/animalhide.dm"
5 changes: 5 additions & 0 deletions modular_ss220/objects/code/animalhide.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/obj/item/stack/sheet/animalhide/mothroach
name = "mothroach hide"
desc = "Тонкий слой шкуры моли."
icon = 'modular_ss220/objects/icons/animalhide.dmi'
icon_state = "mothroach_hide"
Binary file added modular_ss220/objects/icons/animalhide.dmi
Binary file not shown.
5 changes: 5 additions & 0 deletions modular_ss220/vending/code/vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -237,3 +237,8 @@
name = "advanced emergency autoinjector"
desc = "Компания всегда ставит жизни и здоровье своих сотрудников превыше всего."
list_reagents = list("nanites" = 10)

/obj/machinery/economy/vending/shoedispenser/Initialize(mapload)
contraband |= list(/obj/item/clothing/shoes/clown_shoes/moffers = 1)
prices |= list(/obj/item/clothing/shoes/clown_shoes/moffers = 80)
. = ..()

0 comments on commit e5a30bc

Please sign in to comment.