Tigercat2000 40bd004923 Merge remote-tracking branch 'upstream/master' into WeaponCleanup ...

Conflicts:
	code/defines/obj/weapon.dm
	code/modules/hydroponics/trays/tray_tools.dm

2015-05-10 14:15:51 -07:00

..

decals

Botany / Xenobotany Update

2015-05-09 06:00:24 -04:00

spawners

LINDA, Stage 1

2015-04-28 08:43:42 -07:00

aliens.dm

Merge pull request #796 from TheDZD/shadowling

2015-05-04 20:38:20 -04:00

anomalies.dm

Apply most/all of LINDA's updates

2015-04-28 12:45:58 -07:00

barsign.dm

…

biomass_rift.dm

…

bump_teleporter.dm

…

datacore-effect.dm

Cleanup /defines/ folder.

2015-05-09 16:06:59 -07:00

effect_system.dm

Merge pull request #983 from tigercat2000/water_act

2015-05-10 16:14:55 -04:00

explosion_particles.dm

Unused/WorkInProgress folder cleanup

2015-01-31 16:40:29 +01:00

forcefields.dm

Wizard Bugfixes

2015-01-17 12:12:28 -05:00

gibs.dm

Removal of virus1/disease1 system. So long GBS/Jungle Fever, you'll be missed!

2014-07-16 00:53:08 -04:00

glowshroom.dm

Modify fire_act to temperature_expose where needed

2015-04-29 16:56:12 -07:00

landmarks.dm

Add cyborg latejoining

2015-02-05 14:27:39 +01:00

manifest.dm

…

mines.dm

Apply most/all of LINDA's updates

2015-04-28 12:45:58 -07:00

misc.dm

Cleanup /defines/ folder.

2015-05-09 16:06:59 -07:00

overlays.dm

Port of freeze mob verb from NSS Pheonix

2015-02-17 18:04:31 +01:00

portals.dm

VERY Minor Map Fixes, Bug Fixes

2014-12-05 19:08:36 -05:00

spiders.dm

Modify fire_act to temperature_expose where needed

2015-04-29 16:56:12 -07:00

step_triggers.dm

…