Skip to content

Commit

Permalink
твики
Browse files Browse the repository at this point in the history
  • Loading branch information
Anorak2024 committed Dec 6, 2024
1 parent 9041a53 commit 3e55fe0
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 15 deletions.
10 changes: 3 additions & 7 deletions code/game/mecha/mecha_construction_paths.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,7 @@
result = "/obj/mecha/combat/phazon"
steps = list(
//1
list("key" = /obj/item/assembly/signaler/core,
list("key" = /obj/item/assembly/signaler/core/bluespace,
"backkey"=TOOL_CROWBAR,
"desc"="Anomaly core socket is open and awaiting connection."),
//2
Expand Down Expand Up @@ -1288,7 +1288,7 @@
)

/// Inserted bluespace anomaly core.
var/obj/item/assembly/signaler/core/core = null
var/obj/item/assembly/signaler/core/bluespace/core = null

/datum/construction/reversible/mecha/phazon/action(atom/used_atom,mob/user as mob)
return check_step(used_atom,user)
Expand Down Expand Up @@ -1476,11 +1476,7 @@
holder.icon_state = "phazon21"
if(1)
if(diff==FORWARD)
if(!iscorebluespace(used_atom))
to_chat(user, span_warning("Не подходящий тип ядра!"))
return FALSE

var/obj/item/assembly/signaler/core/core = used_atom
var/obj/item/assembly/signaler/core/bluespace/core = used_atom
if(core.get_strenght() < 100)
to_chat(user, span_warning("Ядро слишком слабо!"))
return FALSE
Expand Down
5 changes: 3 additions & 2 deletions code/modules/anomalies/anomalies/energetic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,9 @@
if(!(C.powernet in powernets))
powernets.Add(C.powernet)

var/cur_voltage = voltage * strenght / 100
for(var/datum/powernet/P in powernets)
P.newavail += voltage / powernets.len
P.newavail += cur_voltage / powernets.len

/obj/effect/anomaly/energetic/mob_touch_effect(mob/living/M)
. = ..()
Expand Down Expand Up @@ -120,7 +121,7 @@
/datum/anomaly_impulse/move/machinery_jump/tier1,
)

voltage = 50000
voltage = 75000
collapse_jumps_low = 3
collapse_jumps_high = 7
collapse_shock_range = 3
Expand Down
2 changes: 1 addition & 1 deletion code/modules/anomalies/items/bsg.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
shaded_charge = TRUE
gender = FEMALE
/// Inserted flux anomaly core.
var/obj/item/assembly/signaler/core/core = null
var/obj/item/assembly/signaler/core/energetic/core = null
var/has_bluespace_crystal = FALSE
var/admin_model = FALSE //For the admin gun, prevents crystal shattering, so anyone can use it, and you dont need to carry backup crystals.

Expand Down
2 changes: 1 addition & 1 deletion code/modules/anomalies/items/experimental_syringe_gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/// The size of the internal tank with ready-made reagents.
var/bank_size = 100
/// Inserted vortex anomaly core.
var/obj/item/assembly/signaler/core/core = null
var/obj/item/assembly/signaler/core/vortex/core = null

/obj/item/gun/syringe/rapidsyringe/experimental/Initialize()
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/anomalies/items/fauna_bomb/fauna_bomb.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
righthand_file = 'icons/mob/inhands/relics_production/inhandr.dmi'
origin_tech = "bluespace=4;engineering=5"
/// Inserted atmospheric cnomaly core.
var/obj/item/assembly/signaler/core/core
var/obj/item/assembly/signaler/core/atmospheric/core
/// List of saved mob datas.
var/list/datum/airmob_data/datas = list()
/// List of already created and still alive mobs.
Expand Down
2 changes: 1 addition & 1 deletion code/modules/anomalies/items/gravitational_boots.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
var/recharging_time = 0 // Time until next dash
var/dash_cost = 1000 // Cost to dash.
var/power_consumption_rate = 30 // How much power is used by the boots each cycle when magboots are active
var/obj/item/assembly/signaler/core/core = null
var/obj/item/assembly/signaler/core/gravitational/core = null
var/obj/item/stock_parts/cell/cell = null


Expand Down
2 changes: 1 addition & 1 deletion code/modules/anomalies/items/pyro_claws.dm
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
actions_types = list(/datum/action/item_action/toggle)
var/on_cooldown = FALSE
var/used = FALSE
var/obj/item/assembly/signaler/core/core
var/obj/item/assembly/signaler/core/atmospheric/core

/obj/item/clothing/gloves/color/black/pyro_claws/Destroy()
QDEL_NULL(core)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/anomalies/items/tuned_anomalous_teleporter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
gender = MALE

/// Inserted bluespace anomaly core.
var/obj/item/assembly/signaler/core/core = null
var/obj/item/assembly/signaler/core/bluespace/core = null
/// Variable contains next time hand tele can be used to make it not EMP proof
var/emp_timer = 0
/// Cooldown for teleportations.
Expand Down

0 comments on commit 3e55fe0

Please sign in to comment.