alberyk 4b32268c1a Merge branch 'master' into final_shuttle_touches_and_stuff ...

# Conflicts:
#	code/game/objects/structures/window.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm

2021-12-21 16:51:40 -03:00

..

apc_damage.dm

…

blob.dm

…

brand_intelligence.dm

Rampant Intelligence Event Specifies What's Been Initially Infected (#12600)

2021-10-14 20:18:29 +02:00

camera_damage.dm

…

carp_migration.dm

Ports overmap hazards (#12581)

2021-10-30 14:22:18 +02:00

ccia_general_notice.dm

…

comms_blackout.dm

…

communications_blackout.dm

…

disease_outbreak.dm

…

electrical_storm.dm

…

event_container.dm

Ports overmap hazards (#12581)

2021-10-30 14:22:18 +02:00

event_dynamic.dm

…

event.dm

…

false_alarm.dm

…

gravity.dm

…

grid_check.dm

Ports overmap hazards (#12581)

2021-10-30 14:22:18 +02:00

infestation.dm

…

ion_storm.dm

…

maint_drones.dm

…

meteors.dm

Ports overmap hazards (#12581)

2021-10-30 14:22:18 +02:00

money_hacker.dm

All jobs

2021-09-23 23:07:28 -03:00

money_lotto.dm

…

prison_break.dm

…

radiation_storm.dm

Ports overmap hazards (#12581)

2021-10-30 14:22:18 +02:00

random_antagonist.dm

…

rescue_pod.dm

…

rogue_drones.dm

Ports overmap hazards (#12581)

2021-10-30 14:22:18 +02:00

space_ninja.dm

…

spacevine.dm

…

spider_infestation.dm

…

spontaneous_appendicitis.dm

…

supply_drop.dm

Removes Random Golems (#12287)

2021-08-05 01:34:17 +02:00

vent_clog.dm

No more paint in backpressure surges. (#12800)

2021-12-02 22:57:30 +01:00

visitor.dm

…

wallrot.dm

Ports overmap hazards (#12581)

2021-10-30 14:22:18 +02:00