cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 12:02:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implemented SI prefixes (KILO, MEGA, GIGA, TERA etc.) (#18874)

Browse Source 
Implemented SI prefixes (KILO, MEGA, GIGA, TERA etc.)
This commit is contained in:
Fluffy
2024-04-12 22:22:14 +00:00
committed by GitHub
parent 610d3daa44
commit 5888de6ea0
26 changed files with 102 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cooking/machinery/cooking_machines/fryer.dm
+2 -2
View File
@@ -8,10 +8,10 @@
off_icon = "fryer_off"
food_color = "#ffad33"
appliancetype = FRYER
active_power_usage = 12 KILOWATTS
active_power_usage = 12 KILO WATTS
heating_power = 12000
optimal_power = 1.35
idle_power_usage = 3.6 KILOWATTS
idle_power_usage = 3.6 KILO WATTS
//Power used to maintain temperature once it's heated.
//Going with 25% of the active power. This is a somewhat arbitrary value
resistance = 10000 // Approx. 4 minutes.
code/modules/cooking/machinery/cooking_machines/oven.dm
+2 -2
View File
@@ -7,11 +7,11 @@
appliancetype = OVEN
food_color = "#a34719"
can_burn_food = TRUE
active_power_usage = 6 KILOWATTS
active_power_usage = 6 KILO WATTS
heating_power = 6000
//Based on a double deck electric convection oven
resistance = 10000 // Approx. 4 minutes.
idle_power_usage = 2 KILOWATTS
idle_power_usage = 2 KILO WATTS
//uses ~30% power to stay warm
optimal_power = 1.2
light_x = 2
code/modules/cooking/machinery/cooking_machines/stove.dm
+2 -2
View File
@@ -6,14 +6,14 @@
appliancetype = SKILLET | SAUCEPAN | POT
food_color = "#a34719"
can_burn_food = TRUE
active_power_usage = 6 KILOWATTS
active_power_usage = 6 KILO WATTS
heating_power = 6000
on_icon = "stove"
off_icon = "stove"
place_verb = "onto"
resistance = 5000 // Approx. 2 minutes.
idle_power_usage = 1 KILOWATTS
idle_power_usage = 1 KILO WATTS
//uses ~30% power to stay warm
optimal_temp = T0C + 100 // can boil water!
optimal_power = 1.2
code/modules/heavy_vehicle/equipment/_equipment.dm
+1 -1
View File
@@ -13,7 +13,7 @@
var/mech_layer = MECH_GEAR_LAYER
var/equipment_delay = 0
var/passive_power_use = 0
var/active_power_use = 1 KILOWATTS
var/active_power_use = 1 KILO WATTS
var/require_adjacent = TRUE
var/active = FALSE //For gear that has an active state (ie, floodlights)
code/modules/heavy_vehicle/equipment/combat.dm
+1 -1
View File
@@ -335,7 +335,7 @@
else
STOP_PROCESSING(SSprocessing, src)
active = aura.active
passive_power_use = active ? 1 KILOWATTS : 0
passive_power_use = active ? 1 KILO WATTS : 0
owner.update_icon()
/obj/item/mecha_equipment/shield/deactivate()
code/modules/heavy_vehicle/equipment/utility.dm
+2 -2
View File
@@ -209,7 +209,7 @@
update_icon()
owner.update_icon()
active = on
passive_power_use = on ? 0.1 KILOWATTS : 0
passive_power_use = on ? 0.1 KILO WATTS : 0
/obj/item/mecha_equipment/light/deactivate()
if(on)
@@ -658,7 +658,7 @@
restricted_hardpoints = list(HARDPOINT_BACK)
w_class = ITEMSIZE_HUGE
origin_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 6, TECH_BLUESPACE = 6)
active_power_use = 88 KILOWATTS
active_power_use = 88 KILO WATTS
var/obj/item/anomaly_core/AC
var/image/anomaly_overlay
code/modules/modular_computers/hardware/ai_slot.dm
+1 -1
View File
@@ -9,7 +9,7 @@
origin_tech = list(TECH_POWER = 2, TECH_DATA = 3)
var/obj/item/aicard/stored_card
var/power_usage_idle = 100
var/power_usage_occupied = 2 KILOWATTS
var/power_usage_occupied = 2 KILO WATTS
/obj/item/computer_hardware/ai_slot/proc/update_power_usage()
if(!stored_card?.carded_ai)
code/modules/overmap/ship_weaponry/weaponry/leviathan.dm
+2 -2
View File
@@ -15,8 +15,8 @@
layer = ABOVE_HUMAN_LAYER
use_power = POWER_USE_OFF //Start off.
idle_power_usage = 100 KILOWATTS
active_power_usage = 20 MEGAWATTS
idle_power_usage = 100 KILO WATTS
active_power_usage = 20 MEGA WATTS
var/obj/machinery/power/smes/buildable/smes
/obj/machinery/ship_weapon/leviathan/Destroy()