Skip to content

Commit 3f08229

Browse files
committed
Merge branch 'NewCarrotDrinks' of https://github.com/ostrkrs/Karashit-Paradise-SS220 into NewCarrotDrinks
2 parents e53c65c + daab454 commit 3f08229

File tree

10 files changed

+47
-0
lines changed

10 files changed

+47
-0
lines changed

modular_ss220/clothing/_clothing.dme

+1
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@
1212
#include "code/suits.dm"
1313
#include "code/under.dm"
1414
#include "code/neck.dm"
15+
#include "code/glasses.dm"
+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/obj/item/clothing/glasses/hud/security/eyepatch
2+
name = "повязка на глаз с secHUD"
3+
desc = "Прототип повязки на глаз с интегрированным secHUD. От этого исполнения отказались в пользу более удобного и легковесного размещения в очках, однако на устройство все еще спрос среди ценителей. Данную повязку можно носить как на правом, так и на левом глазу."
4+
icon = 'modular_ss220/clothing/icons/object/eyes.dmi'
5+
icon_state = "hudpatch"
6+
item_state = "hudpatch"
7+
item_color = "hudpatch"
8+
sprite_sheets = list(
9+
"Human" = 'modular_ss220/clothing/icons/mob/eyes.dmi',
10+
"Tajaran" = 'modular_ss220/clothing/icons/mob/eyes.dmi',
11+
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/eyes.dmi',
12+
"Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/eyes.dmi',
13+
"Skrell" = 'modular_ss220/clothing/icons/mob/eyes.dmi',
14+
"Nucleation" = 'modular_ss220/clothing/icons/mob/eyes.dmi',
15+
"Skeleton" = 'modular_ss220/clothing/icons/mob/eyes.dmi',
16+
"Slime People" = 'modular_ss220/clothing/icons/mob/eyes.dmi',
17+
"Unathi" = 'modular_ss220/clothing/icons/mob/eyes.dmi',
18+
"Grey" = 'modular_ss220/clothing/icons/mob/species/grey/eyes.dmi',
19+
"Abductor" = 'modular_ss220/clothing/icons/mob/eyes.dmi',
20+
"Golem" = 'modular_ss220/clothing/icons/mob/eyes.dmi',
21+
"Machine" = 'modular_ss220/clothing/icons/mob/eyes.dmi',
22+
"Diona" = 'modular_ss220/clothing/icons/mob/eyes.dmi',
23+
"Nian" = 'modular_ss220/clothing/icons/mob/eyes.dmi',
24+
"Shadow" = 'modular_ss220/clothing/icons/mob/eyes.dmi',
25+
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/eyes.dmi',
26+
"Drask" = 'modular_ss220/clothing/icons/mob/species/drask/eyes.dmi',
27+
)
28+
prescription_upgradable = FALSE
29+
var/flipped = FALSE
30+
31+
/obj/item/clothing/glasses/hud/security/eyepatch/update_icon_state()
32+
item_state = flipped ? "[initial(item_state)]_flipped" : initial(item_state)
33+
icon_state = flipped ? "[initial(icon_state)]_flipped" : initial(icon_state)
34+
35+
/obj/item/clothing/glasses/hud/security/eyepatch/attack_self__legacy__attackchain(mob/user)
36+
flipped = !flipped
37+
to_chat(user, "You flip [src] [flipped ? "left" : "right"].")
38+
update_icon(UPDATE_ICON_STATE)
805 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
672 Bytes
Binary file not shown.

modular_ss220/loadout/code/donor.dm

+7
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,13 @@
195195
donator_tier = 2
196196
cost = 2
197197

198+
/datum/gear/donor/seceyepatch
199+
display_name = "Повязка secHUD на глаз"
200+
path = /obj/item/clothing/glasses/hud/security/eyepatch
201+
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Adjutant")
202+
donator_tier = 3
203+
cost = 2
204+
198205
// ID Skins
199206
/datum/gear/donor/id_decal_colored
200207
display_name = "Наклейка на карту (Голографическая)"

modular_ss220/objects/code/weapons/ranged/beretta.dm

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
righthand_file = 'modular_ss220/objects/icons/inhands/guns_righthand.dmi'
88
icon_state = "beretta_modified"
99
item_state = "beretta_modified"
10+
origin_tech = "combat=3;materials=2"
1011
w_class = WEIGHT_CLASS_NORMAL
1112
can_suppress = FALSE
1213
can_flashlight = TRUE

0 commit comments

Comments
 (0)