From 14ea69982fd5ae9a4b19cda8bbe0aa79f726196a Mon Sep 17 00:00:00 2001 From: homexp13 Date: Thu, 29 Aug 2024 13:17:26 +0300 Subject: [PATCH 1/4] survivor --- code/datums/jobs/job/survivor.dm | 1 + .../objects/items/reagent_containers/pill.dm | 10 ++ code/game/objects/items/storage/firstaid.dm | 137 ++++++++++++++++++ icons/obj/items/storage/firstaidkit.dmi | Bin 0 -> 1307 bytes 4 files changed, 148 insertions(+) create mode 100644 icons/obj/items/storage/firstaidkit.dmi diff --git a/code/datums/jobs/job/survivor.dm b/code/datums/jobs/job/survivor.dm index e7f18c72c64..b2c78ddd2a6 100644 --- a/code/datums/jobs/job/survivor.dm +++ b/code/datums/jobs/job/survivor.dm @@ -25,6 +25,7 @@ C.equip_to_slot_or_del(new A(C), SLOT_IN_BACKPACK) C.equip_to_slot_or_del(new A(C), SLOT_IN_BACKPACK) C.equip_to_slot_or_del(new A(C), SLOT_IN_BACKPACK) + C.equip_to_slot_or_del(new /obj/item/storage/ai2(C), SLOT_IN_BACKPACK) C.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(C), SLOT_GLASSES) C.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(C), SLOT_R_STORE) diff --git a/code/game/objects/items/reagent_containers/pill.dm b/code/game/objects/items/reagent_containers/pill.dm index ceabfd17956..78d445aa205 100644 --- a/code/game/objects/items/reagent_containers/pill.dm +++ b/code/game/objects/items/reagent_containers/pill.dm @@ -277,3 +277,13 @@ pill_desc = "An Ifosfamide pill. A cytostatic antitumor drug. Quickly heals wounds and burns, but releases histamine. Do not mix with BKT and paracetamol" list_reagents = list(/datum/reagent/medicine/ifosfamide = 15) pill_id = 11 + +/obj/item/reagent_containers/pill/hyronalin + pill_desc = "A hyronalin pill" + list_reagents = list(/datum/reagent/medicine/hyronalin = 15) + pill_id = 17 + +/obj/item/reagent_containers/pill/oxycodone + pill_desc = "A oxycodone pill. Best painkiller." + list_reagents = list(/datum/reagent/medicine/oxycodone = 15) + pill_id = 7 diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index c6038820a75..a31142b1e64 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -596,3 +596,140 @@ set_greyscale_colors(list(bottle_color,label_color)) paint.uses-- update_icon() + +//АИ-2 + +/obj/item/storage/ai2 + name = "\"АИ-2\" first aid kit" + desc = "It's an individual medical kit with rare and useful reagents." + icon = 'icons/obj/items/storage/firstaidkit.dmi' + icon_state = "firstaidkit" + storage_slots = 8 + w_class = WEIGHT_CLASS_NORMAL + use_sound = 'sound/effects/toolbox.ogg' + can_hold = list( + /obj/item/storage/pill_bottle/penal, + /obj/item/reagent_containers/hypospray/autoinjector/pen, + ) + var/is_open = FALSE + +/obj/item/storage/ai2/Initialize(mapload, ...) + . = ..() + + new /obj/item/storage/pill_bottle/penal/meralyne(src) + new /obj/item/storage/pill_bottle/penal/dermaline(src) + new /obj/item/storage/pill_bottle/penal/hyronalin(src) + new /obj/item/storage/pill_bottle/penal/dexalin(src) + new /obj/item/reagent_containers/hypospray/autoinjector/pen/tramadol(src) + new /obj/item/reagent_containers/hypospray/autoinjector/pen/neuraline(src) + new /obj/item/reagent_containers/hypospray/autoinjector/pen/inaprovaline(src) + new /obj/item/reagent_containers/hypospray/autoinjector/pen/hypervene(src) + + update_icon() + +/obj/item/storage/ai2/update_icon_state() + cut_overlays() + + var/list/types_and_overlays = list( + /obj/item/storage/pill_bottle/penal/meralyne = "firstaidkit_meralyne_open", + /obj/item/storage/pill_bottle/penal/dermaline = "firstaidkit_dermaline_open", + /obj/item/storage/pill_bottle/penal/hyronalin = "firstaidkit_hyronalin_open", + /obj/item/storage/pill_bottle/penal/dexalin = "firstaidkit_dexalin_open", + /obj/item/reagent_containers/hypospray/autoinjector/pen/tramadol = "firstaidkit_tramadol_open", + /obj/item/reagent_containers/hypospray/autoinjector/pen/neuraline = "firstaidkit_neuraline_open", + /obj/item/reagent_containers/hypospray/autoinjector/pen/inaprovaline = "firstaidkit_inaprovaline_open", + /obj/item/reagent_containers/hypospray/autoinjector/pen/hypervene = "firstaidkit_hypervene_open", + ) + + if(is_open) + for (var/obj/item/W in contents) + if (types_and_overlays[W.type]) + add_overlay(types_and_overlays[W.type]) + types_and_overlays -= W.type + +/obj/item/storage/ai2/open(mob/user) + . = ..() + icon_state = "firstaidkit_empty" + is_open = TRUE + update_icon() + +/obj/item/storage/ai2/close(mob/user) + . = ..() + icon_state = "firstaidkit" + is_open = FALSE + update_icon() + +/obj/item/storage/ai2/attackby(obj/item/I, mob/user, params) + ..() + update_icon() + +/obj/item/storage/pill_bottle/penal + icon = 'icons/obj/items/storage/firstaidkit.dmi' + max_storage_space = 6 + w_class = WEIGHT_CLASS_TINY + greyscale_config = null + greyscale_colors = null + +/obj/item/storage/pill_bottle/penal/meralyne + name = "Meralyne \"Пенал\" case" + desc = "Contains a few meralyne pills, old and fancy." + icon_state = "meralyne_agent" + pill_type_to_fill = /obj/item/reagent_containers/pill/meralyne + +/obj/item/storage/pill_bottle/penal/dermaline + name = "Dermaline \"Пенал\" case" + desc = "Contains a few dermaline pills, old and fancy." + icon_state = "dermaline_agent" + pill_type_to_fill = /obj/item/reagent_containers/pill/dermaline + +/obj/item/storage/pill_bottle/penal/hyronalin + name = "Hyronalin \"Пенал\" case" + desc = "Contains a few hyronalin pills, old and fancy." + icon_state = "hyronalin_agent" + pill_type_to_fill = /obj/item/reagent_containers/pill/hyronalin + +/obj/item/storage/pill_bottle/penal/dexalin + name = "Dexalin \"Пенал\" case" + desc = "Contains a few dexalin pills, old and fancy." + icon_state = "dexalin_agent" + pill_type_to_fill = /obj/item/reagent_containers/pill/dexalin + +/obj/item/reagent_containers/hypospray/autoinjector/pen + icon = 'icons/obj/items/storage/firstaidkit.dmi' + volume = 30 + init_reagent_flags = null + +/obj/item/reagent_containers/hypospray/autoinjector/pen/tramadol + name = "Tramadol pen" + desc = "A pen loaded with 2 heavy doses of tramadol, use two times for better effect." + icon_state = "tramadol_pen" + amount_per_transfer_from_this = 15 + list_reagents = list(/datum/reagent/medicine/tramadol = 30) + +/obj/item/reagent_containers/hypospray/autoinjector/pen/neuraline + name = "Neuraline pen" + desc = "A pen loaded with strong stimulant reagent. Causes serious intoxication!" + icon_state = "neuraline_pen" + amount_per_transfer_from_this = 4 + list_reagents = list(/datum/reagent/medicine/neuraline = 4) + +/obj/item/reagent_containers/hypospray/autoinjector/pen/inaprovaline + name = "Inaprovaline pen" + desc = "A pen loaded with stimulant reagent. Use it for people in critical condition!" + icon_state = "inaprovaline_pen" + amount_per_transfer_from_this = 15 + list_reagents = list(/datum/reagent/medicine/inaprovaline = 30) + +/obj/item/reagent_containers/hypospray/autoinjector/pen/hypervene + name = "Hypervene pen" + desc = "A pen loaded with purge reagent. Be careful, it causes severe pain and purges EVERYTHING." + icon_state = "hypervene_pen" + amount_per_transfer_from_this = 15 + list_reagents = list(/datum/reagent/hypervene = 30) + +/obj/item/storage/pill_bottle/oxycodone + name = "oxycodone pill bottle" + desc = "Contains pills that numb severe pain." + pill_type_to_fill = /obj/item/reagent_containers/pill/oxycodone + greyscale_colors = "#360570#ffffff" + description_overlay = "Ox" diff --git a/icons/obj/items/storage/firstaidkit.dmi b/icons/obj/items/storage/firstaidkit.dmi new file mode 100644 index 0000000000000000000000000000000000000000..7237f7c35316df1285d1e02cdac80f6a37dcee6a GIT binary patch literal 1307 zcmV+$1?2jPP)005u}0{{R3yb+fl0001@P)t-s0001H z005*?0O4@}dnN+eYyhQ70nTRt#$y1jR1MhJ*r%tbwi*DG83pURDAT4NK%PJ^gD-b? zfm?>jL|(H&NM0*3N5d+LupW4R%tLRtIi{wj>+9=QU35G=JTWmbA|fJMT3TLYb8v8Q ziHV7uE_U2AnNyA^rs;KuB^9nTA<0ZO-fvv3iXt6s9Yt4>D`P7?Ond*@VpXtJZJg$x zfFlk6Jud(N00DGTPE!Ct=GbNc008oOR9JLGWpiV4X>fFDZ*Bkpc$}S-%L>9U5JlI` zR|MUQudN$Vqzk)tCxJ|xU|z(u+P^m{v{ZyVb~DL6cS2^8Io=;nWrYvt5_MqjTr0f8 z+r<(U4^AEP$!3iT2E1YJo7^37;KNzXt&cgqaW_K+^_gE?p`x}#!Z-e>y@E8ZPa^78 zh$O)IeL}UkY6B{XRM1)?xPo+)D`KqfGHD6EZl6O^urjkK>#bIAHmB+{4`jUo+d=Gc zhgPPFFG2O#>lp8eI&40fh8X`}AY5X+$r%5MI&417BWXZ|ANV+gar$xcV*Q_C^&B6o z!{;x10ki~!Eyx?UE&u=nDM>^@RCt{2n~QRqKoo{?h0tic;azK*UXqFy(6+w+t97lK zk^#?8J#Kc}oNt^lGk=uNvkR^V@VtuDRGwPZm%SdU?guCQy0WcPMEN&=@Ld!PbAq7= z{yiedMFhEsAQ$U`=(|>hO1(Rvlnp@@)-_>xcq$6il#^g8MmmdwP@#Hk#gD%WHSMZm)C;I_C=>D_ABNYOb|%)v^6(dl7K z@W`1VzClC${3zoZLre+QbH~Bb6}5T6=Oz953f>;DcN`=t800EgItLH6>klq16?mBz z3{Mb(#7<&f5LS@hi-#j`JR$aCgnm6OnCEgqU5Dw+grNUovEUc;7lOq+w-;Y12!^=k z=P51*YC#?giv?fJ=kwpy+dr375ah;z6$H5;2!bF8f*=TQf_4Y~%bE7vE8)Cgg|@eImG@D$MMQ(!FaV^Qy1k}Kg`6fR*Nd3_5NSH`nD#=nA;qhft?iPP>|ak z;(iy$@p?rIGMhu}#e|-N^tD^#C-MzY&K=_Yi5BuBOdjd0%TUgqBJe=T?Ot)Gh;cz? zjs>~hC$=D3Fxqaf!QTY71qDG61VIo4K`=^^(D#m}DShK;mXUXzu}M1Zc0%N7uiM=a zc{b?xx7U`+lO%Kr)6Hf>l`z|Gw?<2tbiR}K2dBLs Date: Thu, 29 Aug 2024 13:24:15 +0300 Subject: [PATCH 2/4] Update code/game/objects/items/reagent_containers/pill.dm Co-authored-by: Helg2 <93882977+Helg2@users.noreply.github.com> Signed-off-by: homexp13 <52973135+homexp13@users.noreply.github.com> --- code/game/objects/items/reagent_containers/pill.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/reagent_containers/pill.dm b/code/game/objects/items/reagent_containers/pill.dm index 78d445aa205..3dd21af0934 100644 --- a/code/game/objects/items/reagent_containers/pill.dm +++ b/code/game/objects/items/reagent_containers/pill.dm @@ -284,6 +284,6 @@ pill_id = 17 /obj/item/reagent_containers/pill/oxycodone - pill_desc = "A oxycodone pill. Best painkiller." + pill_desc = "An oxycodone pill. Best painkiller." list_reagents = list(/datum/reagent/medicine/oxycodone = 15) pill_id = 7 From fc13a80a020ea13a684b673edde95447faef65f9 Mon Sep 17 00:00:00 2001 From: homexp13 <52973135+homexp13@users.noreply.github.com> Date: Thu, 29 Aug 2024 13:34:24 +0300 Subject: [PATCH 3/4] Update code/game/objects/items/storage/firstaid.dm Co-authored-by: Helg2 <93882977+Helg2@users.noreply.github.com> Signed-off-by: homexp13 <52973135+homexp13@users.noreply.github.com> --- code/game/objects/items/storage/firstaid.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index a31142b1e64..1b079336846 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -642,8 +642,8 @@ ) if(is_open) - for (var/obj/item/W in contents) - if (types_and_overlays[W.type]) + for(var/obj/item/W in contents) + if(types_and_overlays[W.type]) add_overlay(types_and_overlays[W.type]) types_and_overlays -= W.type From 24b0a0e7f348d2e71029113385f58e7222c66261 Mon Sep 17 00:00:00 2001 From: homexp13 <52973135+homexp13@users.noreply.github.com> Date: Thu, 29 Aug 2024 13:34:54 +0300 Subject: [PATCH 4/4] Update code/game/objects/items/storage/firstaid.dm Co-authored-by: Helg2 <93882977+Helg2@users.noreply.github.com> Signed-off-by: homexp13 <52973135+homexp13@users.noreply.github.com> --- code/game/objects/items/storage/firstaid.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 1b079336846..bd6d20a34dc 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -660,7 +660,7 @@ update_icon() /obj/item/storage/ai2/attackby(obj/item/I, mob/user, params) - ..() + . = ..() update_icon() /obj/item/storage/pill_bottle/penal