Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Anorak2024 committed Oct 2, 2024
1 parent 827567b commit 26765e1
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 23 deletions.
8 changes: 0 additions & 8 deletions code/datums/uplink_item.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1691,14 +1691,6 @@
cost = 20
made_by = AFFIL_TIGER + " и " + AFFIL_MI13

/datum/uplink_item/stealthy_tools/syndigaloshes
name = "Маскировочные ботинки с защитой от скольжения"
desc = "Эта обувь позволяет владельцу бегать по мокрому полу и скользким предметам, не падая. Не защитит от смазки."
item = /obj/item/clothing/shoes/chameleon/noslip
cost = 8
excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
made_by = AFFIL_CLOWN

/datum/uplink_item/stealthy_tools/syndigaloshes/nuke
cost = 20
uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/uplinks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ GLOBAL_LIST_EMPTY(world_uplinks)
data["cart"] = generate_tgui_cart()
data["cart_price"] = calculate_cart_tc()
data["lucky_numbers"] = lucky_numbers
data["affiliate"] = affiliate.name
data["affiliate"] = affiliate ? affiliate.name : "None"
data["can_bonus_objectives"] = can_bonus_objectives
data["can_get_intelligence_data"] = get_intelligence_data || uplink_type == UPLINK_TYPE_ADMIN

Expand Down
6 changes: 3 additions & 3 deletions code/modules/antagonists/traitor/affiliates/cybersun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
desc = "На боку едва заметная надпись \"Cybersun Industries\"."
icon = 'icons/obj/affiliates.dmi'
icon_state = "proprietary_ssd"
item_state = "disk"
item_state = "disk_r"
lefthand_file = 'icons/obj/affiliates.dmi'
righthand_file = 'icons/obj/affiliates.dmi'
origin_tech = "programming=4;syndicate=2"
Expand Down Expand Up @@ -157,7 +157,7 @@
desc = "Сложное черное устройство. На боку едва заметная надпись \"Cybersun Industries\"."
icon = 'icons/obj/affiliates.dmi'
icon_state = "invasive_beacon"
item_state = "beacon"
item_state = "beacon_r"
lefthand_file = 'icons/obj/affiliates.dmi'
righthand_file = 'icons/obj/affiliates.dmi'
origin_tech = "programming=6;magnets=3;syndicate=1"
Expand Down Expand Up @@ -188,7 +188,7 @@
desc = "На боку едва заметная надпись \"Cybersun Industries\"."
icon = 'icons/obj/affiliates.dmi'
icon_state = "cindy_pacher"
item_state = "plata"
item_state = "plata_r"
lefthand_file = 'icons/obj/affiliates.dmi'
righthand_file = 'icons/obj/affiliates.dmi'
origin_tech = "programming=7;syndicate=6"
Expand Down
10 changes: 5 additions & 5 deletions code/modules/antagonists/traitor/affiliates/hematogenic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
desc = "Инжектор странной формы, с неестественно двигающейся алой жидкостью внутри. На боку едва заметная гравировка \"Hematogenic Industries\". Конкретно на этом инжекторе установлена блокировка, не позволяющая исспользовать его на случайном гуманойде."
icon = 'icons/obj/affiliates.dmi'
icon_state = "hemophagus_extract"
item_state = "inj_ful"
item_state = "inj_ful_r"
lefthand_file = 'icons/obj/affiliates.dmi'
righthand_file = 'icons/obj/affiliates.dmi'
w_class = WEIGHT_CLASS_TINY
Expand Down Expand Up @@ -81,7 +81,7 @@

vampire.add_objective((!isAdvanced) ? /datum/objective/blood : /datum/objective/blood/ascend)
used = TRUE
item_state = "inj_used"
item_state = "inj_used_r"
update_icon(UPDATE_ICON_STATE)
var/datum/antagonist/traitor/T = user.mind.has_antag_datum(/datum/antagonist/traitor)
if (!T)
Expand Down Expand Up @@ -120,7 +120,7 @@
desc = "Большой шприц для быстрого сбора больших объемов крови. На боку едва заметная гравировка \"Hematogenic Industries\""
icon = 'icons/obj/affiliates.dmi'
icon_state = "blood_harvester"
item_state = "blood1_used"
item_state = "blood1_used_r"
lefthand_file = 'icons/obj/affiliates.dmi'
righthand_file = 'icons/obj/affiliates.dmi'
var/used = FALSE
Expand Down Expand Up @@ -185,7 +185,7 @@
target.blood_volume -= BLOOD_HARVEST_VOLUME
src.target = target.mind
used = TRUE
item_state = "blood1_ful"
item_state = "blood1_ful_r"
update_icon(UPDATE_ICON_STATE)

/obj/item/blood_harvester/update_icon_state()
Expand All @@ -201,7 +201,7 @@
if(new_gender == "Продолжить")
target = null
used = FALSE
item_state = "blood1_used"
item_state = "blood1_used_r"
update_icon(UPDATE_ICON_STATE)

/obj/item/blood_harvester/examine(mob/user)
Expand Down
36 changes: 35 additions & 1 deletion code/modules/antagonists/traitor/affiliates/mi13.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,38 @@
icon_state = "joker"
new /obj/item/toy/plushie/blahaj/twohanded(src)

/obj/item/pen/intel_data
/obj/item/pen/intel_data/attack(mob/living/target, mob/living/user, params, def_zone, skip_attack_anim = FALSE)
. = ATTACK_CHAIN_PROCEED
if(target != user)
return .

for(var/obj/item/implant/uplink/uplink_imp in user)
if(uplink_imp.imp_in != user)
continue

if (uplink_imp.hidden_uplink.get_intelligence_data)
user.balloon_alert(user, "Уже улучшено")
return ATTACK_CHAIN_PROCEED

user.balloon_alert(user, "Улучшено")
uplink_imp.hidden_uplink.get_intelligence_data = TRUE
SStgui.update_uis(uplink_imp.hidden_uplink)

to_chat(user, span_notice("You press [src] onto yourself upgraded hidden uplink."))
qdel(src)
return ATTACK_CHAIN_BLOCKED_ALL

/obj/item/pen/intel_data/afterattack(obj/item/I, mob/user, proximity, params)
if(!proximity)
return

if(istype(I) && I.hidden_uplink && I.hidden_uplink.active) //No metagaming by using this on every PDA around just to see if it gets used up.
if (I.hidden_uplink.get_intelligence_data)
user.balloon_alert(user, "Уже улучшено")
return

user.balloon_alert(user, "Улучшено")
I.hidden_uplink.get_intelligence_data = TRUE
SStgui.update_uis(I.hidden_uplink)
qdel(src)

2 changes: 1 addition & 1 deletion code/modules/antagonists/traitor/affiliates/self.dm
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
item_flags = NOBLUDGEON|NO_MAT_REDEMPTION
icon = 'icons/obj/affiliates.dmi'
icon_state = "self_emag"
item_state = "card"
item_state = "card_r"
lefthand_file = 'icons/obj/affiliates.dmi'
righthand_file = 'icons/obj/affiliates.dmi'
var/list/names = list()
Expand Down
6 changes: 3 additions & 3 deletions code/modules/antagonists/traitor/affiliates/tiger.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
desc = "Кажется, внутри что-то двигается. На боку этикетка \"Tiger Cooperative\""
icon = 'icons/obj/affiliates.dmi'
icon_state = "cling_extract"
item_state = "inj_ful"
item_state = "inj_ful_r"
lefthand_file = 'icons/obj/affiliates.dmi'
righthand_file = 'icons/obj/affiliates.dmi'
var/used_state = "cling_extract_used"
Expand Down Expand Up @@ -89,7 +89,7 @@
target.mind.add_antag_datum(cling)
to_chat(user, span_notice("You inject [target] with [src]"))
used = TRUE
item_state = "inj_used"
item_state = "inj_used_r"
update_icon(UPDATE_ICON_STATE)
else
to_chat(user, span_notice("[target] body rejects [src]"))
Expand All @@ -102,7 +102,7 @@
target.mind.add_antag_datum(cling)
to_chat(user, span_notice("You inject [target == user ? "yourself" : target] with [src]"))
used = TRUE
item_state = "inj_used"
item_state = "inj_used_r"
update_icon(UPDATE_ICON_STATE)
else
to_chat(user, span_notice("[target] body rejects [src]"))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/pda/PDA.dm
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ GLOBAL_LIST_EMPTY(PDAs)
SStgui.update_uis(src)
return ATTACK_CHAIN_BLOCKED_ALL

if(is_pen(I))
if(is_pen(I) && !istype(I, /obj/item/pen/intel_data))
add_fingerprint(user)
var/obj/item/pen/holded_pen = locate() in src
if(holded_pen)
Expand Down

0 comments on commit 26765e1

Please sign in to comment.