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

Fixes #8

Closed
wants to merge 16 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2d04e6d
Вырезаем надоедливый конфликт клавиш
MrCat15352 May 12, 2024
f13368b
Вырезаем дубликаты дефайнов
MrCat15352 May 12, 2024
a76f022
Добавил закрывающий блок ремува
MrCat15352 May 12, 2024
9e7f74f
Merge branch 'MysticalFaceLesS:beta-dev' into fixes
MrCat15352 May 16, 2024
77c789e
Merge branch 'MysticalFaceLesS:beta-dev' into fixes
MrCat15352 May 17, 2024
6013967
Фиксим категорию вещей и апостроф в имени вызывающий рантайм в лодауте
MrCat15352 May 17, 2024
7bd3fd9
Фиксим отсутствующие части тела по отдельности для таяры
MrCat15352 May 17, 2024
8635891
Фикссим палитру цветов для хвостом
MrCat15352 May 17, 2024
3cf1263
Добавляем новые вещи - платья и плащ
MrCat15352 May 17, 2024
8895ae8
Добавляем пак для свадьбы
MrCat15352 May 17, 2024
4344429
Починил рантайм с именем аванпоста
MrCat15352 May 17, 2024
84dacd0
Добавлены кольца. Ну пускай будут
MrCat15352 May 17, 2024
500e65e
Разрешаем класть в кошелек кольца
MrCat15352 May 17, 2024
323d0bd
Перемещаем, добавляем новые платья. Теперь все хорошо
MrCat15352 May 17, 2024
dda4060
Снова поправлены палитры таяры
MrCat15352 May 17, 2024
eea8d09
Добавлены вещи
MrCat15352 May 17, 2024
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
Prev Previous commit
Next Next commit
Добавлены кольца. Ну пускай будут
  • Loading branch information
MrCat15352 committed May 17, 2024
commit 84dacd003408a50e29971a91fbe809765213bb8f
6 changes: 3 additions & 3 deletions mod_celadon/cargo_items/code/packs/costumes_toys.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
/obj/item/clothing/under/suit/burgundy, // A pair of each "fancy suit" color for variety
/obj/item/clothing/under/suit/white,
/obj/item/clothing/under/suit/white, // white is a weird color for a groom but some people are weird
/obj/item/clothing/under/suit/polychromic,
/obj/item/clothing/under/suit/polychromic, // in case you can't be satisfied with the most fitting choices, of course.
/obj/item/clothing/under/dress/wedding,
/obj/item/clothing/under/dress/wedding, // this is what you actually bought the crate for. You can't get these anywhere else.
/obj/item/clothing/under/dress/wedding/orange,
Expand All @@ -27,5 +25,7 @@
/obj/item/reagent_containers/food/drinks/bottle/champagne, //appropriate booze for a wedding
/obj/item/reagent_containers/food/snacks/store/cake/vanilla_cake, // we don't have a full wedding cake but this will do
// /obj/item/storage/fancy/ringbox/silver,
// /obj/item/storage/fancy/ringbox/silver) //diamond rings cost the same price as this crate via cargo so we're not giving you two for free. Wedding rings are traditionally less valuable anyway.
// /obj/item/storage/fancy/ringbox/silver немного текстурка пошла по одному месту, но работает
/obj/item/clothing/gloves/ring/diamond,
/obj/item/clothing/gloves/ring/silver) //diamond rings cost the same price as this crate via cargo so we're not giving you two for free. Wedding rings are traditionally less valuable anyway.
crate_name = "wedding crate"
21 changes: 2 additions & 19 deletions mod_celadon/items/_items.dme
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,7 @@
#include "code/weapons.dm"
#include "code/cloaks.dm"
#include "code/dress.dm"
#include "code/rings.dm"

#endif
// BEGIN_INTERNALS
// END_INTERNALS
// BEGIN_FILE_DIR
#define FILE_DIR .
// END_FILE_DIR
// BEGIN_PREFERENCES
// END_PREFERENCES
// BEGIN_INCLUDE
#include "_items.dm"
#include "code\cloaks.dm"
#include "code\costumes.dm"
#include "code\dress.dm"
#include "code\head.dm"
#include "code\items.dm"
#include "code\pocketwatch.dm"
#include "code\shoes.dm"
#include "code\toggles.dm"
#include "code\weapons.dm"
// END_INCLUDE

15 changes: 15 additions & 0 deletions mod_celadon/items/code/items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -372,3 +372,18 @@
adhomian_day = FLOOR(current_day / 2, 1)
to_chat(usr, "You check your [src.name], glancing over at the watch face, reading the time to be '[adhomian_time]'. Today's date is the '[adhomian_day]th day of [adhomian_month], [adhomian_year]'.")

// Rings
/obj/item/clothing/gloves/ring/diamond
name = "diamond ring"
desc = "An expensive ring, studded with a diamond. Cultures have used these rings in courtship for a millenia."
icon_state = "ringdiamond"
item_state = "dring"

/obj/item/clothing/gloves/ring/diamond/attack_self(mob/user)
to_chat(usr, "The [usr.name] gets down on one knee, presenting \the [src].</span>","<span class='warning'>You get down on one knee, presenting \the [src].")

/obj/item/clothing/gloves/ring/silver
name = "silver ring"
desc = "A tiny silver ring, sized to wrap around a finger."
icon_state = "ringsilver"
item_state = "sring"
60 changes: 60 additions & 0 deletions mod_celadon/items/code/rings.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/obj/item/proc/suicide_act(mob/living/user)
return

/obj/item/clothing/gloves/ring
icon = 'mod_celadon/items/icons/obj/ring.dmi'
mob_overlay_icon = 'mod_celadon/items/icons/mob/inhands/hands.dmi'
name = "gold ring"
desc = "A tiny gold ring, sized to wrap around a finger."
gender = NEUTER
w_class = WEIGHT_CLASS_TINY
icon_state = "ringgold"
item_state = "gring"
// body_parts_covered = 0
strip_delay = 4 SECONDS

/obj/item/clothing/gloves/ring/suicide_act(mob/living/carbon/user)
user.visible_message(span_suicide("\[user] is putting the [src] in [user.p_their()] mouth! It looks like [user] is trying to choke on the [src]!"))
return OXY


/obj/item/clothing/gloves/ring/diamond
name = "diamond ring"
desc = "An expensive ring, studded with a diamond. Cultures have used these rings in courtship for a millenia."
icon_state = "ringdiamond"
item_state = "dring"

/obj/item/clothing/gloves/ring/diamond/attack_self(mob/user)
user.visible_message(span_warning("\The [user] gets down on one knee, presenting \the [src]."),span_warning("You get down on one knee, presenting \the [src]."))

/obj/item/clothing/gloves/ring/silver
name = "silver ring"
desc = "A tiny silver ring, sized to wrap around a finger."
icon_state = "ringsilver"
item_state = "sring"

/*
* Ring Box
*/

/obj/item/storage/fancy/ringbox
name = "ring box"
desc = "A tiny box covered in soft red felt made for holding rings."
icon = 'mod_celadon/items/icons/obj/ring.dmi'
icon_state = "gold ringbox"
w_class = WEIGHT_CLASS_TINY
spawn_type = /obj/item/clothing/gloves/ring
// spawn_count = 1

/obj/item/storage/fancy/ringbox/Initialize(mapload)
. = ..()
// atom_storage.max_slots = 1
// atom_storage.can_hold = typecacheof(list(/obj/item/clothing/gloves/ring))

/obj/item/storage/fancy/ringbox/diamond
icon_state = "diamond ringbox"
spawn_type = /obj/item/clothing/gloves/ring/diamond

/obj/item/storage/fancy/ringbox/silver
icon_state = "silver ringbox"
spawn_type = /obj/item/clothing/gloves/ring/silver
Binary file added mod_celadon/items/icons/mob/inhands/hands.dmi
Binary file not shown.
Binary file added mod_celadon/items/icons/obj/ring.dmi
Binary file not shown.
16 changes: 16 additions & 0 deletions mod_celadon/loadout/code/gloves.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,19 @@
display_name = "maid armcovers"
description = "Cylindrical looking tubes that go over your arm, weird."
path = /obj/item/clothing/gloves/maid

/*
* RINGS
*/

/datum/gear/accessory/gloves/silverring
display_name = "Silver Ring"
path = /obj/item/clothing/gloves/ring/silver

/datum/gear/accessory/gloves/goldring
display_name = "Gold Ring"
path = /obj/item/clothing/gloves/ring

/datum/gear/accessory/gloves/diamondring
display_name = "Diamond Ring"
path = /obj/item/clothing/gloves/ring/diamond