alberyk 12a70b50b7 Merge branch 'master' into updates_the_nbt ...

# Conflicts:
#	code/__defines/misc.dm
#	code/game/machinery/machinery.dm
#	maps/_common/mapsystem/map.dm

2022-02-19 10:26:35 -03:00

..

chem

K'ois Spores Buff (#11641)

2021-04-18 12:47:15 +02:00

decals

Initialize and GC failure fixes #1 (#13190)

2022-02-15 23:45:30 +01:00

projectile

SCC Things (#11330)

2021-03-18 17:10:36 +01:00

spawners

TTV Timer Fix (#11176)

2021-02-13 13:22:03 +01:00

temporary_visuals

Exosuit Phazon Module (#12157)

2021-07-14 22:37:50 -03:00

aliens.dm

…

bump_teleporter.dm

…

burnt_wall.dm

…

effect_system.dm

Ports Technomancer from Polaris. (#11595)

2021-05-08 16:08:53 +02:00

explosion_particles.dm

…

gibs.dm

…

glowshroom.dm

…

landmarks.dm

Merge branch 'master' into final_shuttle_touches_and_stuff

2022-01-17 22:20:15 -03:00

manifest.dm

Revert "New Check" (#11344)

2021-03-01 18:24:59 +01:00

misc.dm

…

overlays.dm

Reverts #13170 and #12989 (#13194)

2022-02-16 00:50:33 +01:00

plastic_explosive.dm

C4 (Plastique) Improvements (#9327)

2020-10-20 13:46:18 +02:00

portals.dm

Finish porting bay's timer SS (#12978)

2022-01-29 13:07:51 -03:00

spiders.dm

Spider references in descriptions changed to greimorians. (#11213)

2021-02-17 10:43:20 +01:00

step_triggers.dm

…