Skip to content

Commit

Permalink
Merge branch 'survey-scanner' of https://github.com/Bjarl/Shiptest in…
Browse files Browse the repository at this point in the history
…to survey-scanner
  • Loading branch information
Erikafox committed Nov 13, 2023
2 parents dc3cb17 + e8735d7 commit 7441c2e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
6 changes: 3 additions & 3 deletions code/game/objects/effects/anomalies/_anomalies.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
//for anomaly effects, range is how far the effects can reach, the cooldown lets us wire in effects that happen every pulse delay seconds
var/effectrange = 6

var/anomalyResearchValue = 1
var/anomalyResearchValueMult = 1

COOLDOWN_DECLARE(pulse_cooldown)
COOLDOWN_DECLARE(pulse_secondary_cooldown)
Expand Down Expand Up @@ -50,7 +50,7 @@
aSignal = new aSignal(src)
aSignal.code = rand(1,100)
aSignal.anomaly_type = type
aSignal.research = rand(1000,4000) * anomalyResearchValue
aSignal.research = rand(1000,4000) * anomalyResearchValueMult

var/frequency = rand(MIN_FREE_FREQ, MAX_FREE_FREQ)
if(ISMULTIPLE(frequency, 2))//signaller frequencies are always uneven!
Expand Down Expand Up @@ -154,7 +154,7 @@
/obj/effect/anomaly/examine(mob/user)
. = ..()
if(user.research_scanner == TRUE)
to_chat(user, span_notice("If harvested, this anomaly would be worth [research_value] research points."))
to_chat(user, span_notice("If harvested, this anomaly would be worth [aSignal.research] research points."))

/obj/effect/anomaly/throw_atom_into_space()
qdel(src)
5 changes: 0 additions & 5 deletions code/game/objects/items/gear_packs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@
update_power()
return

/obj/item/gear_pack/examine(mob/user)
if(cell)
examine_list += "<span class='notice'>A small readout displays [PERCENT(cell.charge/cell.maxcharge)]% charge.</span>"


/obj/item/gear_pack/fire_act(exposed_temperature, exposed_volume)
. = ..()
if(attachment?.loc == src)
Expand Down

0 comments on commit 7441c2e

Please sign in to comment.