Tigercat2000 633a9e68b4 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark ...

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	 ^ This shit is haunted. It's conflicted on two branches for 0
	 reason, the automatic merge wouldn't work on the fucking end of
	 file.

2015-10-19 16:13:51 -07:00

..

admin

Merge pull request #2355 from Fox-McCloud/eye-fixes

2015-10-14 18:29:57 -04:00

alarm

…

assembly

More Dereferencing

2015-10-12 02:37:52 -04:00

atmos_automation

…

awaymissions

corrects a few del's

2015-10-08 21:22:20 -04:00

client

Merge pull request #2253 from Markolie/darkness

2015-10-01 17:11:31 -04:00

clothing

Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark

2015-10-19 16:13:51 -07:00

computer3

Last Few Destroy Fixes

2015-10-10 00:16:31 -04:00

crafting

…

customitems

Merge pull request #2292 from tigercat2000/fancy

2015-10-06 18:49:08 -04:00

destilery

…

detective_work

…

economy

Drone message fix, let robots unbuckle

2015-10-05 19:37:35 +02:00

events

…

examine

more de-referencing

2015-10-12 04:18:49 -04:00

ext_scripts

…

fish

corrects a few del's

2015-10-08 21:22:20 -04:00

flufftext

Another del->qdel pass

2015-10-08 16:49:10 -04:00

food

Another del->qdel pass

2015-10-08 16:49:10 -04:00

games

…

garbage_collection

Garbage Collect Everything

2015-10-13 20:23:26 -04:00

holiday

…

hydroponics

Another del->qdel pass

2015-10-08 16:49:10 -04:00

jungle

Another del->qdel pass

2015-10-08 16:49:10 -04:00

karma

…

library

…

lighting

…

liquid

…

media

…

mining

Turf cleanup, Shoe unsnowflaking

2015-10-10 10:00:51 -07:00

mob

Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark

2015-10-19 16:13:51 -07:00

nano

Baystation Rigsuits

2015-10-05 16:42:00 -07:00

ninja

…

organs

surgeryize me cap'n

2015-10-14 07:05:49 -04:00

paperwork

Merge pull request #2304 from Markolie/paper

2015-10-06 17:23:57 -04:00

pooling

Removes the Rest of Pooled Objects

2015-10-08 14:18:40 -04:00

power

Lights and Static Power: Machine Processing Optimization

2015-10-18 21:06:25 -04:00

procedural_mapping

…

projectiles

Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark

2015-10-19 16:13:51 -07:00

reagents

Merge pull request #2386 from Fox-McCloud/reagents-seeing

2015-10-19 18:53:45 -04:00

recycling

Reduces Round-start Atmos Processing: Full Charge Disposals

2015-10-17 19:53:21 -04:00

research

Cuts out all the old weapon/module code

2015-10-13 21:13:49 -07:00

scripting

corrects a few del's

2015-10-08 21:22:20 -04:00

security_levels

…

shieldgen

…

shuttles

…

space_transition

…

store

…

surgery

surgeryize me cap'n

2015-10-14 07:05:49 -04:00

telesci

…

tram

…

vehicle

-tg- pull refactor

2015-10-10 11:15:52 -07:00

virus2

Custom_emote now used in place of emote("me")

2015-10-09 13:00:05 -07:00