Skip to content

Commit 264b6a2

Browse files
blakecrazy13root
authored and
root
committed
Рампо, не бей... (#362)
Вот Ваши кастомки, как и заказывали. А также фикс елки, теперь нельзя ее двигать.
1 parent 563ee69 commit 264b6a2

File tree

18 files changed

+19
-5
lines changed

18 files changed

+19
-5
lines changed

code/game/objects/structures/christmas.dm

+2-1
Original file line numberDiff line numberDiff line change
@@ -153,4 +153,5 @@
153153
icon = 'icons/obj/flora/pinetrees.dmi'
154154
icon_state = "pine_c"
155155
density = 1
156-
opacity = 0
156+
opacity = 0
157+
anchored = 1

code/modules/clothing/masks/miscellaneous.dm

+6
Original file line numberDiff line numberDiff line change
@@ -336,3 +336,9 @@
336336
icon_state = "bandskull"
337337
item_state = "bandskull"
338338

339+
/obj/item/clothing/mask/bandana/customwhite //Custom item
340+
name = "white bandana"
341+
desc = "A fine white bandana with nanotech lining. Can be worn on the head or face."
342+
icon_state = "custom_bandwhite"
343+
item_state = "custom_bandwhite"
344+

code/modules/clothing/suits/jobs.dm

+7
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,13 @@
122122
desc = "A red forensics technician jacket."
123123
icon_state = "forensics_red"
124124

125+
126+
/obj/item/clothing/suit/storage/forensics/customred //Custom item
127+
name = "red jacket"
128+
desc = "A nice red forensics technician jacket."
129+
icon_state = "custom_forensics_red_long"
130+
item_state = "custom_forensics_red_long"
131+
125132
/obj/item/clothing/suit/storage/forensics/blue
126133
name = "blue jacket"
127134
desc = "A blue forensics technician jacket."

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

+4-4
Original file line numberDiff line numberDiff line change
@@ -2098,11 +2098,11 @@
20982098
glass_desc = "Favorite drink for chapters!"
20992099

21002100
/datum/reagent/ethanol/chacha
2101-
name = "Сhacha"
2102-
description = "favorite drink of mountain peoples."
2101+
name = "Chacha"
2102+
description = "favorite drink of mountain people."
21032103
color = "#f0db7f"
21042104
strength = 100
21052105
taste_description = "one feels the taste of a distant mountainous country"
21062106

2107-
glass_name = "Сhacha"
2108-
glass_desc = "favorite drink of mountain peoples."
2107+
glass_name = "Chacha"
2108+
glass_desc = "favorite drink of mountain people."

icons/inv_slots/hats/icon.dmi

-11.2 KB
Binary file not shown.

icons/inv_slots/hats/mob.dmi

-8.76 KB
Binary file not shown.

icons/inv_slots/masks/icon.dmi

-4.18 KB
Binary file not shown.

icons/inv_slots/masks/mob.dmi

-1.81 KB
Binary file not shown.

icons/inv_slots/suits/icon.dmi

-18 KB
Binary file not shown.

icons/inv_slots/suits/mob.dmi

-3.55 KB
Binary file not shown.

icons/mob/onmob/head.dmi

447 Bytes
Binary file not shown.

icons/mob/onmob/head_slim.dmi

496 Bytes
Binary file not shown.

icons/mob/onmob/mask.dmi

344 Bytes
Binary file not shown.

icons/mob/onmob/mask_slim.dmi

408 Bytes
Binary file not shown.

icons/mob/onmob/suit.dmi

888 Bytes
Binary file not shown.

icons/mob/onmob/suit_slim.dmi

771 Bytes
Binary file not shown.

icons/obj/clothing/masks.dmi

625 Bytes
Binary file not shown.

icons/obj/clothing/suits.dmi

390 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)