From e93b61343af9e5b4365e413a6987b68d88721618 Mon Sep 17 00:00:00 2001
From: HardexZ <33863785+HardexZ@users.noreply.github.com>
Date: Sun, 28 Jan 2024 21:37:04 +0500
Subject: [PATCH] Added new item and uplink updated

Added shadowlight and mod pack for new uplink items
---
 modular_ss220/modular_ss220.dme               |   1 +
 modular_ss220/objects/_objects.dme            |  32 ++++++++++++++++++
 modular_ss220/objects/code/flashlight.dm      |   9 +++++
 modular_ss220/objects/icons/lighting.dmi      | Bin 0 -> 471 bytes
 modular_ss220/uplink_items/_uplink_items.dm   |   8 +++++
 modular_ss220/uplink_items/_uplink_items.dme  |  12 +++++++
 .../uplink_items/code/uplink_general.dm       |   8 +++++
 7 files changed, 70 insertions(+)
 create mode 100644 modular_ss220/objects/code/flashlight.dm
 create mode 100644 modular_ss220/objects/icons/lighting.dmi
 create mode 100644 modular_ss220/uplink_items/_uplink_items.dm
 create mode 100644 modular_ss220/uplink_items/_uplink_items.dme
 create mode 100644 modular_ss220/uplink_items/code/uplink_general.dm

diff --git a/modular_ss220/modular_ss220.dme b/modular_ss220/modular_ss220.dme
index 53a170e02283..58a3ee3132b9 100644
--- a/modular_ss220/modular_ss220.dme
+++ b/modular_ss220/modular_ss220.dme
@@ -77,6 +77,7 @@
 #include "phrases/_phrases.dme"
 #include "species_whitelist/_species_whitelist.dme"
 #include "antagonists/_antagonists.dme"
+#include "uplink_items/_uplink_items.dme"
 
 // --- PRIME --- //
 // #define MODPACK_MAIN_ONLY
diff --git a/modular_ss220/objects/_objects.dme b/modular_ss220/objects/_objects.dme
index 56083ab10a68..f92511fe7eb7 100644
--- a/modular_ss220/objects/_objects.dme
+++ b/modular_ss220/objects/_objects.dme
@@ -24,3 +24,35 @@
 #include "code/musician.dm"
 #include "code/flag.dm"
 #include "code/wallets.dm"
+#include "code/flashlight.dm"
+// BEGIN_INTERNALS
+// END_INTERNALS
+// BEGIN_FILE_DIR
+#define FILE_DIR .
+// END_FILE_DIR
+// BEGIN_PREFERENCES
+// END_PREFERENCES
+// BEGIN_INCLUDE
+#include "_objects.dm"
+#include "code\beach_umbrella.dm"
+#include "code\beretta.dm"
+#include "code\big_bed.dm"
+#include "code\billboard.dm"
+#include "code\card_skins.dm"
+#include "code\closets.dm"
+#include "code\flag.dm"
+#include "code\hampters.dm"
+#include "code\key.dm"
+#include "code\mattress.dm"
+#include "code\miscellaneous.dm"
+#include "code\musician.dm"
+#include "code\officetoys.dm"
+#include "code\papershredder.dm"
+#include "code\plastic_chair.dm"
+#include "code\platform.dm"
+#include "code\posters.dm"
+#include "code\tribune.dm"
+#include "code\wallets.dm"
+#include "code\weapons.dm"
+#include "code\mecha\lockermech.dm"
+// END_INCLUDE
diff --git a/modular_ss220/objects/code/flashlight.dm b/modular_ss220/objects/code/flashlight.dm
new file mode 100644
index 000000000000..107de5f0abf0
--- /dev/null
+++ b/modular_ss220/objects/code/flashlight.dm
@@ -0,0 +1,9 @@
+/obj/item/flashlight/shadowlight
+	name = "flashlight"
+	desc = "A hand-held emergency light."
+	icon = 'modular_ss220/objects/icons/lighting.dmi'
+	icon_state = "shadowlight"
+	item_state = "shadowlight"
+	brightness_on = 3 // A little better than the standard flashlight.
+	light_power = -2
+	hitsound = 'sound/weapons/genhit1.ogg'
diff --git a/modular_ss220/objects/icons/lighting.dmi b/modular_ss220/objects/icons/lighting.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..681726d0fedbe4d41fb810aed1e1807c1c61b93e
GIT binary patch
literal 471
zcmV;|0Vw{7P)<h;3K|Lk000e1NJLTq002M$001Be0{{R3l|zoU0000;P)t-sz`(!@
zA!R&c-6ce*7cYJqG<-j7?>t`2BtMlcQN2NF-g9$v7Z(>LK9GTdfiO*_UteDmD}22t
zB>>+5N=iz4dU_&0lw4d~bk;3%00001bW%=J06^y0W&i*Hbb3@+bVOxyV{&P5bZKvH
z004NLQ&w<tb@%jBaPjrzDoZUY&dkqKuvIY8GvMMZ&rB)F0CJ3txHvOXGt)ClAe`co
z#FA7XQ>i#3F(tn|2PC7!#hH>>R16d~<l;;#O3Y1#u(7Gt&CkQ7Tv@@@&jsuj0Ox)x
z?>erJAOHXWy-7qtR7i>KlEDtbAP__g%N7)@SaJLRf9ft(lM=wA9(YNcCU0io&}kYB
z{tl&gKx<R;_{DP{0OYABaPE7hG`zo|5<r~0UKy}f4&Wnft?y3fj`tyWbFm-Fg!g`N
z*NzV{%0k9u%KZ=)*YPpt1#=VDHS)Xc^TNyD?}eXIcrYOu5>GbrCDp-awwC8WzCkjU
zNL;2i(D3^L_Z5*SVoEQ4*Yr7&cBd-)>{Hqh+g^U7Bc(^7;|GJ^@&uHL4G#<R+R*?2
N002ovPDHLkV1mcU$YB5g

literal 0
HcmV?d00001

diff --git a/modular_ss220/uplink_items/_uplink_items.dm b/modular_ss220/uplink_items/_uplink_items.dm
new file mode 100644
index 000000000000..41bb319adbe9
--- /dev/null
+++ b/modular_ss220/uplink_items/_uplink_items.dm
@@ -0,0 +1,8 @@
+/datum/modpack/example
+	/// A string name for the modpack. Used for looking up other modpacks in init.
+	name = "Uplink items"
+	/// A string desc for the modpack. Can be used for modpack verb list as description.
+	desc = "Модуль предметов для аплинка"
+	/// A string with authors of this modpack.
+	author = "HardexZ/TheReal"
+
diff --git a/modular_ss220/uplink_items/_uplink_items.dme b/modular_ss220/uplink_items/_uplink_items.dme
new file mode 100644
index 000000000000..8ed9dc08b06c
--- /dev/null
+++ b/modular_ss220/uplink_items/_uplink_items.dme
@@ -0,0 +1,12 @@
+#include "_uplink_items.dm"
+
+#include "code/uplink_general.dm"
+// BEGIN_INTERNALS
+// END_INTERNALS
+// BEGIN_FILE_DIR
+#define FILE_DIR .
+// END_FILE_DIR
+// BEGIN_PREFERENCES
+// END_PREFERENCES
+// BEGIN_INCLUDE
+// END_INCLUDE
diff --git a/modular_ss220/uplink_items/code/uplink_general.dm b/modular_ss220/uplink_items/code/uplink_general.dm
new file mode 100644
index 000000000000..75fa32322511
--- /dev/null
+++ b/modular_ss220/uplink_items/code/uplink_general.dm
@@ -0,0 +1,8 @@
+/datum/uplink_item/device_tools/shadowlight
+    name = "Shadowlight"
+    desc = "A gadget disguised as a flashlight that literally creates darkness within a certain radius. \
+            Envelop yourself in darkness and hide from prying eyes. \
+            Does not work in bright light. "
+    reference = "SHAD"
+    item = /obj/item/flashlight/shadowlight
+    cost = 20