Fox McCloud 9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage ...

# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm

2019-09-28 00:16:11 -04:00

..

holidays

…

wizard

…

abductor.dm

SSticker

2019-04-30 16:47:47 +01:00

alien_infestation.dm

gives event larva a growth boost

2019-07-26 18:55:49 +02:00

anomaly_bluespace.dm

Issue #12331 - Stops bluespace anomaly from teleporting ghosts. (#12433)

2019-09-27 18:56:21 -07:00

anomaly_flux.dm

…

anomaly_grav.dm

…

anomaly_pyro.dm

Makes Xenobiology Simpler. Removes Slimes (#12398)

2019-09-24 16:17:33 -07:00

anomaly_vortex.dm

…

anomaly.dm

…

aurora_caelus.dm

…

blob.dm

Increases timer for blob mouse spawn (#12359)

2019-09-24 15:11:12 -07:00

brand_intelligence.dm

…

cargobonus.dm

…

carp_migration.dm

Tweaks Space Carp Event: Improve Performance

2019-09-03 15:36:44 -04:00

communications_blackout.dm

…

disease_outbreak.dm

Update disease_outbreak.dm

2019-07-11 02:36:30 -04:00

dust.dm

…

electrical_storm.dm

…

event_container.dm

…

event_procs.dm

…

event.dm

…

false_alarm.dm

…

floorcluwne.dm

…

grid_check.dm

Reverts "Fixes Grid Check"

2019-08-26 00:44:46 -04:00

headcrabs.dm

New headcrabs! (#12352)

2019-09-20 19:04:41 -07:00

immovable_rod.dm

nor-shall-our-souls-falter

2019-09-17 16:06:09 -04:00

infestation.dm

…

ion_storm.dm

…

koi_mirgration.dm

Tweaks Space Carp Event: Improve Performance

2019-09-03 15:36:44 -04:00

mass_hallucination.dm

…

meaty_gore.dm

…

meaty_ops.dm

…

meaty_ores.dm

…

meteors.dm

…

money_hacker.dm

…

money_lotto.dm

…

money_spam.dm

…

prison_break.dm

…

radiation_storm.dm

…

rogue_drones.dm

…

sentience.dm

Processing fix

2019-07-20 18:53:05 +02:00

slaughterevent.dm

…

spacevine.dm

Merge remote-tracking branch 'upstream/master' into universal-damage

2019-09-28 00:16:11 -04:00

spider_infestation.dm

…

spider_terror.dm

…

spontaneous_appendicitis.dm

…

tear_honk.dm

Refactors Simple Mob Creation: Adjusts Which Mobs are Available (#12325)

2019-09-17 16:06:43 -07:00

tear.dm

Merge remote-tracking branch 'upstream/master' into universal-damage

2019-09-21 12:40:07 -04:00

traders.dm

…

undead.dm

…

vent_clog.dm

…

wallrot.dm

…

wormholes.dm

Tesla wormhole fix

2019-06-06 17:14:34 +02:00