Markolie 01f2c85347 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ...

# Conflicts:
#	code/__DEFINES/misc.dm
#	code/game/dna/genes/goon_powers.dm
#	code/game/dna/genes/vg_powers.dm
#	code/game/objects/effects/overlays.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/statue.dm
#	code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
#	icons/mob/back.dmi
#	icons/obj/storage.dmi

2016-12-23 19:32:19 +01:00

..

holidays

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation

2016-08-03 13:31:42 -07:00

abductor.dm

fixes

2016-04-18 22:53:31 -04:00

alien_infestation.dm

Removes Event Procs

2016-11-16 07:14:08 -05:00

anomaly_bluespace.dm

Removes most hard-coded z level checks

2016-07-31 21:29:03 -07:00

anomaly_flux.dm

…

anomaly_grav.dm

…

anomaly_pyro.dm

…

anomaly_vortex.dm

…

anomaly.dm

…

blob.dm

…

brand_intelligence.dm

Removes most hard-coded z level checks

2016-07-31 21:29:03 -07:00

cargobonus.dm

…

carp_migration.dm

Mass replace

2016-07-07 19:34:02 -07:00

communications_blackout.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

disease_outbreak.dm

Merge pull request #5394 from Fox-McCloud/clientless-mobs

2016-08-10 18:21:29 -04:00

dust.dm

Removes most hard-coded z level checks

2016-07-31 21:29:03 -07:00

electrical_storm.dm

…

event_container.dm

Adds electrical grid check to random events.

2016-07-21 22:46:16 +03:00

event_manager.dm

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

event.dm

fixes

2016-04-18 22:53:31 -04:00

false_alarm.dm

…

grid_check.dm

Merge conflicts begone

2016-08-01 18:28:47 -07:00

immovable_rod.dm

Lay groundwork for megafauna, and add Ashdragon.

2016-10-23 23:15:57 +02:00

infestation.dm

…

ion_storm.dm

Mass replace

2016-07-07 19:34:02 -07:00

mass_hallucination.dm

Ports over the status effect unification

2016-10-23 15:45:35 -07:00

meaty_gore.dm

reworked the event

2016-03-31 14:03:05 -04:00

meaty_ops.dm

Various grammar/spelling fixes

2016-08-05 18:43:33 -04:00

meaty_ores.dm

Mass replace

2016-07-07 19:34:02 -07:00

meteors.dm

…

money_hacker.dm

…

money_lotto.dm

…

money_spam.dm

Mass replace

2016-07-07 19:34:02 -07:00

prison_break.dm

Moves many uses of log_to_dd to log_runtime, to make the output

2016-08-24 09:55:19 -07:00

radiation_storm.dm

Removes most hard-coded z level checks

2016-07-31 21:29:03 -07:00

rogue_drones.dm

Removes most hard-coded z level checks

2016-07-31 21:29:03 -07:00

slaughterevent.dm

special_role/objective refactor

2016-08-01 21:29:19 -07:00

spacevine.dm

…

spider_infestation.dm

Removes most hard-coded z level checks

2016-07-31 21:29:03 -07:00

spontaneous_appendicitis.dm

Appendix-less mobs cannot contract appendicitis

2016-08-28 14:37:08 +01:00

tear.dm

defines

2016-04-04 17:01:03 -04:00

traders.dm

Traders Event (#4016)

2016-06-11 12:47:20 -04:00

undead.dm

Removes most hard-coded z level checks

2016-07-31 21:29:03 -07:00

vent_clog.dm

Removes most hard-coded z level checks

2016-07-31 21:29:03 -07:00

wallrot.dm

…

wormholes.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation

2016-08-03 13:31:42 -07:00