Markolie 1d6754728b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates ...

# Conflicts:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi

2017-02-06 20:37:03 +01:00

..

decals

Merge remote-tracking branch 'upstream/master' into botany-rework

2017-02-05 05:26:46 -05:00

spawners

Kinetic accelerator update, other fixes

2017-02-06 18:39:03 +01: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

Botany Rework

2017-01-21 18:28:03 -05:00

explosion_particles.dm

…

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

more fixes and features

2017-01-25 01:04:01 -05:00

landmarks.dm

Merge remote-tracking branch 'upstream/master' into botany-rework

2017-02-05 05:26:46 -05:00

manifest.dm

-tg- OOP Hud Refactor

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

mines.dm

Fixes conflict (rebase)

2017-02-06 04:09:15 -08:00

misc.dm

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

2016-12-01 22:38:35 -05:00

overlays.dm

Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions

2017-02-06 19:55:37 +01:00

portals.dm

Wormhole Event Fix, Portal GC Fix

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

spiders.dm

Giant Spiders no longer clog up the Alien role channel

2017-01-09 13:38:34 -08:00

step_triggers.dm

…