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

..

decals

Added Bubblegum. Added dismemberment chance to bullets, and made changes to GPS tracking.

2016-10-25 00:50:31 +02:00

spawners

Moves from log_debug to log_runtime for non-fatal abberant states

2016-08-23 17:03:52 -07:00

aliens.dm

Tiger request

2016-12-10 16:58:54 -08:00

anomalies.dm

Lay groundwork for megafauna, and add Ashdragon.

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

barsign.dm

…

bump_teleporter.dm

-tg- OOP Hud Refactor

2016-04-21 20:28:08 -07:00

datacore-effect.dm

Add crew manifest world/Topic

2016-07-26 06:27:12 -07:00

effect_system.dm

Ports over the status effect unification

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

explosion_particles.dm

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

forcefields.dm

Miming Refactor

2016-02-28 22:40:00 -05:00

gibs.dm

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

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

glowshroom.dm

Mass replace

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

landmarks.dm

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

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

manifest.dm

-tg- OOP Hud Refactor

2016-04-21 20:28:08 -07:00

mines.dm

Added Bubblegum. Added dismemberment chance to bullets, and made changes to GPS tracking.

2016-10-25 00:50:31 +02:00

misc.dm

BSA Tweaks

2016-11-09 22:36:03 -05:00

overlays.dm

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

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

portals.dm

Wormhole Event Fix, Portal GC Fix

2016-08-08 09:03:30 -04:00

spiders.dm

Fix spiderling remains being draggable

2016-10-25 18:43:06 +02:00

step_triggers.dm

…