StrangeWeirdKitten 132f9363e4 Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into fuck-fuck-fuck ...

# Conflicts:
#	_maps/map_files/Birdshot/birdshot.dmm
#	_maps/map_files/NorthStar/north_star.dmm
#	_maps/map_files/VoidRaptor/VoidRaptor.dmm
#	code/datums/status_effects/debuffs/debuffs.dm
#	code/game/objects/items/devices/scanners/health_analyzer.dm
#	code/modules/cargo/packs/imports.dm
#	html/changelogs/archive/2024-07.yml

2024-07-31 21:19:46 -06:00

..

apc

Power cell overlay now updates when exiting an object's contents (#85079)

2024-07-31 12:30:57 -04:00

lighting

Power cell overlay now updates when exiting an object's contents (#85079)

2024-07-31 12:30:57 -04:00

singularity

Corrects 200+ instances of "it's" where it should've been "its" instead (#85169)

2024-07-21 15:47:03 -04:00

supermatter

Corrects 200+ instances of "it's" where it should've been "its" instead (#85169)

2024-07-21 15:47:03 -04:00

tesla

[MIRROR] Fixes grounding rods (#28773)

2024-07-11 19:42:18 +05:30

turbine

Corrects 200+ instances of "it's" where it should've been "its" instead (#85169)

2024-07-21 15:47:03 -04:00

battery.dm

[MIRROR] Adds a new power storage type: The Megacell. Drastically reduces power cell consumption/storage. [MDB Ignore] (#28376)

2024-07-01 23:44:49 +05:30

cable.dm

[MIRROR] Pegging Update (#28212)

2024-06-17 22:35:25 +01:00

cell.dm

[MIRROR] Adds a new power storage type: The Megacell. Drastically reduces power cell consumption/storage. [MDB Ignore] (#28376)

2024-07-01 23:44:49 +05:30

energy_accumulator.dm

Upstream power stuff combined and shit (#27284)

2024-04-12 06:33:40 +02:00

floodlight.dm

Upstream power stuff combined and shit (#27284)

2024-04-12 06:33:40 +02:00

gravitygenerator.dm

Fixes gravity generator hard del (#85390)

2024-07-31 13:36:19 -04:00

monitor.dm

Corrects 200+ instances of "it's" where it should've been "its" instead (#85169)

2024-07-21 15:47:03 -04:00

multiz.dm

…

pipecleaners.dm

Corrects 200+ instances of "it's" where it should've been "its" instead (#85169)

2024-07-21 15:47:03 -04:00

port_gen.dm

Corrects 200+ instances of "it's" where it should've been "its" instead (#85169)

2024-07-21 15:47:03 -04:00

power_store.dm

Power cell overlay now updates when exiting an object's contents (#85079)

2024-07-31 12:30:57 -04:00

power.dm

Corrects 200+ instances of "it's" where it should've been "its" instead (#85169)

2024-07-21 15:47:03 -04:00

powernet.dm

Upstream power stuff combined and shit (#27284)

2024-04-12 06:33:40 +02:00

rtg.dm

Upstream power stuff combined and shit (#27284)

2024-04-12 06:33:40 +02:00

smes.dm

Merge branch 'master' of https://github.com/skyrat-ss13/skyrat-tg into upstream-7-24/204

2024-07-25 00:08:53 -06:00

solar.dm

SMES and Solar Update (#28234)

2024-07-01 18:03:01 +05:30

terminal.dm

Mirror (#27453)

2024-04-26 01:22:24 +02:00

thermoelectric_generator.dm

[Semi-Modular] Adds TEG back, nerfs its power generation and resprites it (#26260)

2024-04-30 13:29:56 +00:00

tracker.dm

[MIRROR] Refactors how machines are deconstructed (#26466)

2024-02-20 01:49:51 +01:00