mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-28 23:51:17 +01:00
Range and heat sensors buff, better range input (#15770)
This commit is contained in:
@@ -88,6 +88,9 @@
|
||||
distress_beacons.Add(list(list("caller" = vessel.name, "sender" = "[job_string][H.name]", "bearing" = bearing)))
|
||||
if(length(distress_beacons))
|
||||
data["distress_beacons"] = distress_beacons
|
||||
data["range_choices"] = list()
|
||||
for(var/i in 1 to sensors.max_range)
|
||||
data["range_choices"] += i
|
||||
|
||||
|
||||
var/list/contacts = list()
|
||||
@@ -178,7 +181,14 @@
|
||||
if(!CanInteract(usr, default_state))
|
||||
return TOPIC_NOACTION
|
||||
if (nrange)
|
||||
sensors.set_range(Clamp(nrange, 1, world.view))
|
||||
sensors.set_range(Clamp(nrange, 1, sensors.max_range))
|
||||
return TOPIC_REFRESH
|
||||
if(href_list["range_choice"])
|
||||
var/nrange = text2num(href_list["range_choice"])
|
||||
if(!CanInteract(usr, default_state))
|
||||
return TOPIC_NOACTION
|
||||
if(nrange)
|
||||
sensors.set_range(Clamp(nrange, 1, sensors.max_range))
|
||||
return TOPIC_REFRESH
|
||||
if (href_list["toggle"])
|
||||
sensors.toggle()
|
||||
@@ -288,9 +298,10 @@
|
||||
var/max_health = 200
|
||||
var/health = 200
|
||||
var/critical_heat = 50 // sparks and takes damage when active & above this heat
|
||||
var/heat_reduction = 0.5 // mitigates this much heat per tick - can sustain range 2
|
||||
var/heat_reduction = 1.7 // mitigates this much heat per tick - can sustain range 4
|
||||
var/heat = 0
|
||||
var/range = 1
|
||||
var/max_range = 10
|
||||
var/sensor_strength = 5//used for detecting ships via contacts
|
||||
idle_power_usage = 5000
|
||||
|
||||
@@ -337,7 +348,7 @@
|
||||
|
||||
var/overlay = "[base_icon_state]-effect"
|
||||
|
||||
var/range_percentage = range / world.view * 100
|
||||
var/range_percentage = range / max_range * 100
|
||||
|
||||
if(range_percentage < 20)
|
||||
overlay = "[overlay]1"
|
||||
@@ -419,11 +430,13 @@
|
||||
|
||||
// For small shuttles
|
||||
/obj/machinery/shipsensors/weak
|
||||
heat_reduction = 0.35 // Can sustain range 1
|
||||
heat_reduction = 1.7 // Can sustain range 4
|
||||
max_range = 7
|
||||
desc = "Miniturized gravity scanner with various other sensors, used to detect irregularities in surrounding space. Can only run in vacuum to protect delicate quantum BS elements."
|
||||
|
||||
/obj/machinery/shipsensors/strong
|
||||
name = "sensors suite"
|
||||
desc = "An upgrade to the standard ship-mounted sensor array, this beast has massive cooling systems running beneath it, allowing it to run hotter for much longer. Can only run in vacuum to protect delicate quantum BS elements."
|
||||
icon_state = "sensor_suite"
|
||||
heat_reduction = 1.6 // can sustain range 4
|
||||
heat_reduction = 3.7 // can sustain range 6
|
||||
max_range = 14
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
################################
|
||||
# Example Changelog File
|
||||
#
|
||||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||
#
|
||||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||
# When it is, any changes listed below will disappear.
|
||||
#
|
||||
# Valid Prefixes:
|
||||
# bugfix
|
||||
# wip (For works in progress)
|
||||
# tweak
|
||||
# soundadd
|
||||
# sounddel
|
||||
# rscadd (general adding of nice things)
|
||||
# rscdel (general deleting of nice things)
|
||||
# imageadd
|
||||
# imagedel
|
||||
# maptweak
|
||||
# spellcheck (typo fixes)
|
||||
# experiment
|
||||
# balance
|
||||
# admin
|
||||
# backend
|
||||
# security
|
||||
# refactor
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: DreamySkrell
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- tweak: "Changes the sensors console range input to a button selection ranging from 1 to max sensor range."
|
||||
- tweak: "Tweaks sensors suites max range and heat efficiency values. Standard sensors are now 10 max range, and sustainable heat is at 4 range. Strong sensors are 14/6, weak are 7/4."
|
||||
- tweak: "Horizon's sensors suite is now the 'strong' variant."
|
||||
@@ -13047,7 +13047,7 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/bridge/controlroom)
|
||||
"kBl" = (
|
||||
/obj/machinery/shipsensors{
|
||||
/obj/machinery/shipsensors/strong{
|
||||
pixel_y = 7
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning/full,
|
||||
|
||||
@@ -14,7 +14,9 @@
|
||||
<span class='white'>Range:</span>
|
||||
</div>
|
||||
<div class="itemContent">
|
||||
{{:helper.link(data.range, null, { 'range' : 1 }, null, null)}}
|
||||
{{for data.range_choices}}
|
||||
{{:helper.link(value, null, { 'range_choice' : value }, null, value==data.range ? 'selected' : null)}}
|
||||
{{/for}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user