Skip to content

Подушки для сидения #2

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.

Sign up for GitHub

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

Open
Sosiskoed wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Подушки для сидения #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f2596b
Подушки для сидения
Sosiskoed Mar 4, 2018
652b20e
Сосисочное обновление 20.03.2018
Sosiskoed Mar 20, 2018
7e7a165
Небольшие правки
Sosiskoed Mar 20, 2018
48e9043
Коллекторы
Sosiskoed Mar 20, 2018
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
11 changes: 11 additions & 0 deletions code/game/objects/items/stacks/sheets/sheet_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,17 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
new/datum/stack_recipe("purple comfy chair", /obj/structure/bed/chair/comfy/purp, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("green comfy chair", /obj/structure/bed/chair/comfy/green, 2, one_per_turf = 1, on_floor = 1), \
), 2), \
new/datum/stack_recipe_list("pillows",list(\
new/datum/stack_recipe("grey pillow", /obj/item/weapon/pillow, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("beige pillow", /obj/item/weapon/pillow/beige, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("black pillow", /obj/item/weapon/pillow/black, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("blue pillow", /obj/item/weapon/pillow/blue, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("brown pillow", /obj/item/weapon/pillow/brown, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("green pillow", /obj/item/weapon/pillow/green, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("purple pillow", /obj/item/weapon/pillow/purple, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("red pillow", /obj/item/weapon/pillow/red, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("teal pillow", /obj/item/weapon/pillow/teal, one_per_turf = 1, on_floor = 1), \
), 1), \
null, \
new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts, 2), \
new/datum/stack_recipe("rack parts", /obj/item/weapon/table_parts/rack), \
Expand Down
35 changes: 35 additions & 0 deletions code/game/objects/structures/stool_bed_chair_nest/stools.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,38 @@
new /obj/item/stack/sheet/metal(src.loc)
del(src)
..()

/obj/item/weapon/pillow
name = "big pillow"
desc = "It looks very soft."
icon = 'icons/obj/objects.dmi'
icon_state = "bigpillow"
force = 0
throwforce = 0
w_class = 5
color = rgb(255,255,255)
hitsound = 'sound/weapons/punch3.ogg'

/obj/item/weapon/pillow/brown
color = rgb(141,70,0)

/obj/item/weapon/pillow/red
color = rgb(218,2,10)

/obj/item/weapon/pillow/teal
color = rgb(0,234,250)

/obj/item/weapon/pillow/black
color = rgb(60,60,60)

/obj/item/weapon/pillow/green
color = rgb(1,196,8)

/obj/item/weapon/pillow/purple
color = rgb(112,2,176)

/obj/item/weapon/pillow/blue
color = rgb(2,9,210)

/obj/item/weapon/pillow/beige
color = rgb(255,253,195)
Binary file modified icons/obj/objects.dmi
View file
Open in desktop
Binary file not shown.
Loading