nevimer c633a2f8ff Merge remote-tracking branch 'skrat/master' into upstream-merge-branch ...

# Conflicts:
#	code/modules/research/machinery/_production.dm

2023-07-26 16:21:40 -04:00

..

area

[MIRROR] [NO-GBP] Optimizes rad nebula [MDB IGNORE] (#22675)

2023-07-25 13:26:22 -04:00

gamemodes

Merge remote-tracking branch 'skrat/master' into upstream-jul-24

2023-07-24 20:11:34 -04:00

machinery

Merge remote-tracking branch 'skrat/master' into upstream-merge-branch

2023-07-26 16:21:40 -04:00

objects

Merge remote-tracking branch 'skrat/master' into upstream-merge-branch

2023-07-26 16:21:40 -04:00

turfs

[MIRROR] NEW STATION TRAIT: Radioactive Nebula [MDB IGNORE] (#22614)

2023-07-24 02:07:40 -04:00

alternate_appearance.dm

…

atom_defense.dm

[MIRROR] [NO GBP]Fix atom defense and silenced armour penetration not using the same logic. [MDB IGNORE] (#22042)

2023-07-11 15:01:49 -05:00

atoms_movable.dm

[MIRROR] Stabilizes code that flicks overlays to view/all clients [MDB IGNORE] (#22601)

2023-07-20 18:59:09 -04:00

atoms.dm

[MIRROR] Adds an element to water turfs that makes things... look like they're actually immersed in water. [MDB IGNORE] (#22623)

2023-07-24 00:28:58 -04:00

communications.dm

…

data_huds.dm

[MIRROR] Allows uniforms to have multiple accessories attached, removes armor from accessories [MDB IGNORE] (#22404)

2023-07-20 16:44:14 -04:00

movable_luminosity.dm

…

say.dm

[MIRROR] Adds cardboard IDs to the game: The broke man's agent ID. [MDB IGNORE] (#22341)

2023-07-15 01:06:41 -04:00

shuttle_engines.dm

[MIRROR] Icons folder cleaning wave two [MDB IGNORE] (#22454)

2023-07-16 00:41:18 -04:00

sound.dm

[MISSED MIRROR] Macros multi-z code, removes the false premise of manual offsets (#76248) (#22531)

2023-07-18 02:28:15 +00:00

world.dm

…