Skip to content

Commit

Permalink
Небольшие фиксы декораций. (#13823)
Browse files Browse the repository at this point in the history
* Календарь обновлён до 2025-го года. Пофикшена ошибка в картотеке папок что делала её невидимой. Ручка теперь автоматически помещается в держатель для ручки.

* Плохая скобка

* Забытые оффсеты

* Исправления подставки для ручек
  • Loading branch information
DarthSidiousPalpatine authored Feb 20, 2025
1 parent 8d147ae commit 013caca
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 10 deletions.
4 changes: 2 additions & 2 deletions code/game/objects/effects/decals/contraband.dm
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@
random_basetype = /obj/structure/sign/poster

/obj/structure/sign/poster/calendar
name = "2224 calendar"
name = "2225 calendar"
icon_state = "calendar"
desc = "Brand new calendar for year 2224."
desc = "Brand new calendar for year 2225."

/obj/structure/sign/poster/sivtsev
name = "sivtsev table"
Expand Down
34 changes: 28 additions & 6 deletions code/game/objects/items/decorations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,46 @@

var/obj/item/weapon/pen/holded

/obj/item/pen_holder/atom_init(mapload)
. = ..()

if(mapload)
var/turf/T = get_turf(src)
var/obj/item/weapon/pen/Pen = locate() in T.contents
if(Pen)
Pen.forceMove(src)
holded = Pen

update_icon()

/obj/item/pen_holder/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/pen) && !holded)
user.drop_from_inventory(I, src)
holded = I
holded.pixel_x = -2
holded.pixel_y = 5
underlays += holded
icon_state = "penholder_full"

update_icon()

/obj/item/pen_holder/attack_hand(mob/user)
if(holded)
underlays = null
holded.pixel_x = 0
holded.pixel_y = 0
user.put_in_active_hand(holded)
holded = null
icon_state = "penholder"

update_icon()
else
..()

/obj/item/pen_holder/update_icon()
underlays = null
icon_state = "penholder"

if(holded)
icon_state = "penholder_full"
holded.pixel_x = -2
holded.pixel_y = 5
underlays += holded

/obj/item/pens_bin
name = "pens bin"
desc = "Органайзер для ручек."
Expand Down Expand Up @@ -65,6 +85,8 @@
var/obj/item/weapon/pen/selection = show_radial_menu(user, src, pens, require_near = TRUE, tooltips = TRUE)

if(selection)
selection.pixel_x = 0
selection.pixel_y = 0
if(ishuman(user))
user.put_in_hands(selection)
else
Expand Down
4 changes: 2 additions & 2 deletions code/modules/paperwork/folders.dm
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@
. = ..()
if(mapload)
var/atom/A = get_turf(src)
for(var/obj/item/weapon/folder in A.contents)
folder.forceMove(src)
for(var/obj/item/weapon/folder/Folder in A.contents)
Folder.forceMove(src)
update_icon()

/obj/item/folder_holder/update_icon()
Expand Down
Binary file modified icons/obj/contraband.dmi
Binary file not shown.

0 comments on commit 013caca

Please sign in to comment.