Kyep 102ff67095 fixes merge conflict

2018-08-01 04:13:22 -07:00

..

holidays

Removes All Weapons

2018-04-15 16:25:56 -04:00

abductor.dm

…

alien_infestation.dm

Xeno spawn consistency

2017-10-03 13:03:42 -04:00

anomaly_bluespace.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

anomaly_flux.dm

…

anomaly_grav.dm

…

anomaly_pyro.dm

…

anomaly_vortex.dm

…

anomaly.dm

…

aurora_caelus.dm

Fix Aurora Caelus spelling and grammar. Fixes #8945

2018-05-09 19:03:49 -05:00

blob.dm

…

brand_intelligence.dm

Ports TG's Garbage Subsystem

2018-03-28 20:02:39 -04:00

cargobonus.dm

…

carp_migration.dm

Suggested changes

2018-07-04 00:12:54 -04:00

communications_blackout.dm

…

disease_outbreak.dm

AGHHHHHHHHHHHHHHHHHHH WHATTT

2018-07-17 04:58:36 -04:00

dust.dm

…

electrical_storm.dm

…

event_container.dm

maybe dis?

2018-07-02 17:03:02 -04:00

event_manager.dm

Nightshifts & Randomized Station Time

2018-03-25 23:01:04 -07:00

event.dm

…

false_alarm.dm

…

grid_check.dm

fixes grid check causing blue

2018-06-23 19:27:21 -07:00

immovable_rod.dm

…

infestation.dm

Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings

2018-05-31 19:34:47 -07:00

ion_storm.dm

Make ion laws more specie inclusive

2018-07-01 12:16:26 +02:00

koi_mirgration.dm

Suggested changes

2018-07-04 00:12:54 -04:00

mass_hallucination.dm

AGHHHHHHHHHHHHHHHHHHH WHATTT

2018-07-17 04:58:36 -04:00

meaty_gore.dm

…

meaty_ops.dm

…

meaty_ores.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

meteors.dm

…

money_hacker.dm

Nightshifts & Randomized Station Time

2018-03-25 23:01:04 -07:00

money_lotto.dm

…

money_spam.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

prison_break.dm

Nightshifts & Randomized Station Time

2018-03-25 23:01:04 -07:00

radiation_storm.dm

Converts and Updates Weather Subsystem

2018-05-21 00:01:18 -04:00

rogue_drones.dm

compiles, find and replace particle_effect and effect_system

2017-11-04 20:16:01 +04:00

sentience.dm

…

slaughterevent.dm

…

spacevine.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

spider_infestation.dm

…

spider_terror.dm

more spiderling updates

2018-02-16 01:26:33 -08:00

spontaneous_appendicitis.dm

Removes Disease one and Virology

2017-07-08 23:10:17 -04:00

tear.dm

…

traders.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

undead.dm

…

vent_clog.dm

compiles, find and replace particle_effect and effect_system

2017-11-04 20:16:01 +04:00

wallrot.dm

…

wormholes.dm

…