alberyk 805ffc2f85 Merge branch 'master' into computer_tweaks ...

# Conflicts:
#	code/game/jobs/job/ship_crew.dm

2021-10-10 13:18:14 -03:00

..

auras

…

effects

Event Map Refactor (#12329)

2021-09-23 13:34:47 -03:00

items

Merge branch 'master' into computer_tweaks

2021-10-10 13:18:14 -03:00

random

Adds short-barreled AR to random weapons and FL ERT leader (#12399)

2021-08-30 18:25:48 +02:00

structures

Merge branch 'master' into computer_tweaks

2021-10-10 13:18:14 -03:00

buckling.dm

…

empulse.dm

…

explosion.dm

…

items.dm

Revert "Pipegun Buff (#12365)" (#12429)

2021-08-31 21:56:36 +02:00

objs.dm

Infrared Sensor bugfixes (#12050)

2021-06-16 18:52:46 -03:00

structures.dm

…