From b70d1d9247932b02a89c0e767dafc92c2c645010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B8=D1=80=D0=BE=D1=82=D0=BA=D0=B0?= <114731039+ErdGinalD@users.noreply.github.com> Date: Mon, 23 Oct 2023 17:40:48 +0300 Subject: [PATCH 1/3] FIX: Paintkits (#553) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает Чинит пейнткиты, прошлый фикс всё сломал, тут точно все нормально мамой клянусь(не своей) ## Почему это хорошо для игры фикс ## Изображения изменений ## Тестирование ## Changelog --- .../mecha_skins/code/paintkit_install.dm | 58 ++++++++++--------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/modular_ss220/mecha_skins/code/paintkit_install.dm b/modular_ss220/mecha_skins/code/paintkit_install.dm index 66024132262d..36a8b333c52d 100644 --- a/modular_ss220/mecha_skins/code/paintkit_install.dm +++ b/modular_ss220/mecha_skins/code/paintkit_install.dm @@ -1,32 +1,34 @@ /obj/mecha/attackby(obj/item/W, mob/user, params) - . = ..() - if(istype(W, /obj/item/paintkit)) - if(occupant) - to_chat(user, "Вы не можете кастомизировать экзокостюм, пока кто-то его пилотирует - это небезопасно!") - return - - var/obj/item/paintkit/P = W - var/found = null - - for(var/type in P.allowed_types) - if(type == initial_icon) - found = 1 - break - - if(!found) - to_chat(user, "Этот комплект не предназначен для использования на экзокостюме данного класса.") - return - - user.visible_message("[user] открывает [P] и проводит некоторое время за кастомизацией [src].") - if(do_after_once(user, 3 SECONDS, target = src)) - - name = P.new_name - desc = P.new_desc - icon = 'modular_ss220/mecha_skins/code/mecha.dmi' - initial_icon = P.new_icon - wreckage = P.new_wreckage - reset_icon() - qdel(P) + if(!istype(W, /obj/item/paintkit)) + return ..() + if(occupant) + to_chat(user, "Вы не можете кастомизировать экзокостюм, пока кто-то его пилотирует - это небезопасно!") + return + + var/obj/item/paintkit/P = W + var/found = null + + for(var/type in P.allowed_types) + if(type == initial_icon) + found = 1 + break + + if(!found) + to_chat(user, "Этот комплект не предназначен для использования на экзокостюме данного класса.") + return + + user.visible_message("[user] открывает [P] и проводит некоторое время за кастомизацией [src].") + if(!do_after_once(user, 3 SECONDS, target = src)) + to_chat(user, "Вы должны стоять смирно при настройке экзокостюма!") + return + name = P.new_name + desc = P.new_desc + icon = 'modular_ss220/mecha_skins/code/mecha.dmi' + initial_icon = P.new_icon + wreckage = P.new_wreckage + reset_icon() + qdel(P) + //RIP AND PEPPERONI From d05f9bf0745bdad3f067a685ae003e8a826e2a1e Mon Sep 17 00:00:00 2001 From: larentoun <31931237+larentoun@users.noreply.github.com> Date: Tue, 24 Oct 2023 16:46:02 +0300 Subject: [PATCH 2/3] [BALANCE] Prone Targetting (#546) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает ![image](https://github.com/ss220club/Paradise-SS220/assets/31931237/623e6f7f-135d-4968-a0b0-1072ff6f1a4e) ## Почему это хорошо для игры ![image](https://github.com/ss220club/Paradise-SS220/assets/31931237/7d7155db-7f12-4787-b08f-a04bba9593f4) ## Изображения изменений ![image](https://github.com/ss220club/Paradise-SS220/assets/31931237/7bb45fa6-4160-4a8d-b0c3-86be5c7484cf) ## Тестирование ![image](https://github.com/ss220club/Paradise-SS220/assets/31931237/1bf97b2b-d660-4848-b6c5-0c9d4a2a3bf9) ## Changelog :cl: add: Чтобы попасть по лежачей цели оружием дальнего боя, теперь нужно кликать по кукле лежачей цели. /:cl: --- modular_ss220/balance/_balance.dme | 1 + modular_ss220/balance/code/items/projectiles.dm | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 modular_ss220/balance/code/items/projectiles.dm diff --git a/modular_ss220/balance/_balance.dme b/modular_ss220/balance/_balance.dme index 52c2762c4ed5..6ae675b11d03 100644 --- a/modular_ss220/balance/_balance.dme +++ b/modular_ss220/balance/_balance.dme @@ -1,5 +1,6 @@ #include "_balance.dm" +#include "code/items/projectiles.dm" #include "code/items/weapons.dm" #include "code/jobs/warden.dm" #include "code/species/nucleation.dm" diff --git a/modular_ss220/balance/code/items/projectiles.dm b/modular_ss220/balance/code/items/projectiles.dm new file mode 100644 index 000000000000..9e5f649da3e8 --- /dev/null +++ b/modular_ss220/balance/code/items/projectiles.dm @@ -0,0 +1,2 @@ +/mob/living/carbon/human/projectile_hit_check(obj/item/projectile/P) + return !density From e3de1633d2a1ea4a355bf7300956c2dfb7d8e4c3 Mon Sep 17 00:00:00 2001 From: Aylong <69762909+Aylong220@users.noreply.github.com> Date: Tue, 24 Oct 2023 16:48:09 +0300 Subject: [PATCH 3/3] Sprite: Dresser and Cabinet (#547) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает Заменяет спрайт у шкафа и шуфлядки. ## Почему это хорошо для игры Чуть меньше кринжовых срайтов? ## Изображения изменений ![image](https://github.com/ss220club/Paradise-SS220/assets/69762909/48a59114-8051-4b21-8838-7f4a935259ae) ## Тестирование No. ## Changelog :cl: imageadd: Шуфлядка теперь красивая, а не из 2013 imageadd: Старые шкайфы сожрали термиты, НТ закупило новые /:cl: --------- Co-authored-by: Furior --- modular_ss220/aesthetics/_aesthetics.dme | 27 +++++++++--------- .../aesthetics/closets/code/closets.dm | 11 +++++++ .../aesthetics/closets/icons/closets.dmi | Bin 0 -> 1407 bytes .../aesthetics/dresser/code/dresser.dm | 3 ++ .../aesthetics/dresser/icons/dresser.dmi | Bin 0 -> 339 bytes modular_ss220/aesthetics/racks/code/racks.dm | 4 --- 6 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 modular_ss220/aesthetics/closets/code/closets.dm create mode 100644 modular_ss220/aesthetics/closets/icons/closets.dmi create mode 100644 modular_ss220/aesthetics/dresser/code/dresser.dm create mode 100644 modular_ss220/aesthetics/dresser/icons/dresser.dmi diff --git a/modular_ss220/aesthetics/_aesthetics.dme b/modular_ss220/aesthetics/_aesthetics.dme index 3ef26695fe4d..025d98435259 100644 --- a/modular_ss220/aesthetics/_aesthetics.dme +++ b/modular_ss220/aesthetics/_aesthetics.dme @@ -1,7 +1,11 @@ #include "_aesthetics.dm" #include "airalarm\code\airalarm.dm" +#include "airlocks\code\airlock.dm" +#include "airlocks\code\airlock_assembly_types.dm" +#include "airlocks\code\airlock_types.dm" #include "apc\code\apc.dm" +#include "applicator\code\applicator.dm" #include "atm\code\atm.dm" #include "atmospherics\code\atmospherics.dm" #include "better_ids\code\better_ids.dm" @@ -9,44 +13,41 @@ #include "boxes\code\boxes.dm" #include "cameras\code\cameras.dm" #include "chairs\code\chairs.dm" +#include "closets\code\closets.dm" +#include "decals\code\decals.dm" #include "defib\code\defib.dm" #include "dirwindows\code\dirwindows.dm" #include "door_control\code\door_control.dm" +#include "dresser\code\dresser.dm" #include "extinguisher\code\extinguisher.dm" #include "firealarm\code\firealarm.dm" #include "floors\code\floors.dm" #include "floors\code\tile_types.dm" #include "goonstation\code\items.dm" #include "hydroponics\code\hydroponics.dm" +#include "intercom\code\intercom.dm" #include "keycard\code\keycard.dm" #include "labeler\code\labeler.dm" #include "library\code\library.dm" #include "light_switch\code\light_switch.dm" +#include "lights\code\lights.dm" #include "newscaster\code\newscaster.dm" #include "piano\code\piano.dm" #include "racks\code\racks.dm" #include "requests_console\code\requests_console.dm" #include "rollerbed\code\rollerbed.dm" #include "safe\code\safe.dm" +#include "satellite\code\satellite.dm" +#include "sheets\code\sheets.dm" #include "shutters\code\shutters.dm" +#include "skin\code\darkmode.dm" #include "soap\code\soap.dm" #include "stamps\code\stamps.dm" #include "surgery_table\code\surgery_table.dm" #include "toolboxes\code\toolboxes.dm" #include "wallcloset\code\wallcloset.dm" +#include "walls\code\walls.dm" #include "windoor\code\windoor.dm" +#include "windows\code\windows.dm" #include "windowtint\code\windowtint.dm" #include "zippo\code\zippo.dm" -#include "intercom\code\intercom.dm" -#include "walls\code\walls.dm" -#include "windows\code\windows.dm" -#include "decals\code\decals.dm" -#include "airlocks\code\airlock.dm" -#include "airlocks\code\airlock_types.dm" -#include "airlocks\code\airlock_assembly_types.dm" -#include "lights\code\lights.dm" -#include "skin\code\darkmode.dm" -#include "sheets\code\sheets.dm" -#include "applicator\code\applicator.dm" -#include "satellite\code\satellite.dm" - diff --git a/modular_ss220/aesthetics/closets/code/closets.dm b/modular_ss220/aesthetics/closets/code/closets.dm new file mode 100644 index 000000000000..a269306e34ab --- /dev/null +++ b/modular_ss220/aesthetics/closets/code/closets.dm @@ -0,0 +1,11 @@ +/obj/structure/closet/cabinet + icon = 'modular_ss220/aesthetics/closets/icons/closets.dmi' + +/obj/structure/closet/secure_closet/detective + icon = 'modular_ss220/aesthetics/closets/icons/closets.dmi' + +/obj/structure/closet/secure_closet/bar + icon = 'modular_ss220/aesthetics/closets/icons/closets.dmi' + +/obj/structure/closet/secure_closet/personal/cabinet + icon = 'modular_ss220/aesthetics/closets/icons/closets.dmi' diff --git a/modular_ss220/aesthetics/closets/icons/closets.dmi b/modular_ss220/aesthetics/closets/icons/closets.dmi new file mode 100644 index 0000000000000000000000000000000000000000..c36b0b3d104623af51981031689de801e48d61cc GIT binary patch literal 1407 zcmV-_1%UdAP)V=-0C=2@&Akf3FcbygIeCghyNXzU#w^kz9okor*j(Gtn3N=1e0ztAE(+l; z=fHQkIgZt-Zc#Qhe~=H_SqSXc8_s5};sAl&ma~C$Kg6YkC?i22yIbSBkyOT+(mp_- z;Oy$tlszC&SX@=i%wp&rI_l@ZX%nEm2>_d&QY}` z%BJQoVf|=GEw+$!000D%NklwS znDIQ0SEyz@lA@`@H%^dagB9#ReY0YpYgMw(nVg5Odkgs zz=o$5CIb->5fKp)5fKp)5fKrQwdUsL0+)n!ZV96<^poiWApQP$@1Dbk(Os3T1Z~UasOn-0SYR@n= zH6=c6Z2wn6vonEd>4MX897&OD0jj#T2WY2VW4qi_s9XZbLZ#_x@$2NIQcqyzT7c_RW&kB7 zfQ6bzN6KZH0G9fDanaea4-u&f>?R)GEX2N#e!jX9xjQl)-*z1rgC5>2h+DU>V(;Ht z0aZCWmF##OM1aKS^z;Q}j!hVdTjWHeHW*u*hCa&~pTT6fO z&tB-;Fw^l}5ZD7uj{F=u$l{xik>6`NzU`DQ0qfP>$N`3n{gL0BmiRVP-WGoA_SLqp zuPndo_;0$rc^iH-Hs=K@Zel5O|;X$;&3d(SJE-Q52Ys&0Q{ z6$g7;KUX*RL)CRsJrh9c5<)ov!p_IXnZGy1+gP$!TUmaGjf2BT^=%v+qUfm$o*pqy zQt8CM66PZt%bUQ3>^ZE}gP*kZD`d|dtIL~IX~6{WY1ebb?EyN~Z5n3+705F=srMyG zO9HG{cVpeEkvUotV7SOzW%Tx-3FFlUsQTcH`T_E z(*r#F>lckjd{X`C87pq_J16y*fyG|QL73}Bqi9bw4-i>~F`v@H9cL@5DGXKqsQy^W<~vxdKp z3Ezg0Gzd(9_3Ey+9WhZP6+emHIceAd_z5{cCC!0^Lf42Yt N002ovPDHLkV1np$oiqRd literal 0 HcmV?d00001 diff --git a/modular_ss220/aesthetics/dresser/code/dresser.dm b/modular_ss220/aesthetics/dresser/code/dresser.dm new file mode 100644 index 000000000000..6dcf5993f629 --- /dev/null +++ b/modular_ss220/aesthetics/dresser/code/dresser.dm @@ -0,0 +1,3 @@ +/obj/structure/dresser + icon = 'modular_ss220/aesthetics/dresser/icons/dresser.dmi' + icon_state = "dresser" diff --git a/modular_ss220/aesthetics/dresser/icons/dresser.dmi b/modular_ss220/aesthetics/dresser/icons/dresser.dmi new file mode 100644 index 0000000000000000000000000000000000000000..32bc0252a965967fdc8fdde4435d6e640cdac584 GIT binary patch literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(iS0EjyFVUZ5(d4V{Aj!MG zP59YNhE2QI2mmD*OM?7@862M7NCR@Rt3o15TvCgZi!uvJGV}8o7%JujhZPi+e*Y3& z@bT*tEpJ_|b7#&6ZwNKGX#C)j&UqirlMF>Yy*n(7gN!d5dnwF$H0j8s5QSjPr5amz zSZwv^>^4^2yh1`F>BP~QVN+(z=1SDo-tlW^11}px^+Rc9FZInAfYz3Jx;TbtOiWHt zU^n1WVu)}!A;H(flA)%shK2o90%LlMaf|E$CI!_~0!&&Am-rMDm=X^j6JSzP(8%FY zRAA~;_$+ggr}aix&I-e>g~yI9TbaSs*5tv|cO%AY