xxalpha 662af7174f Merge remote-tracking branch 'upstream/master' into fixfixfix ...

Conflicts:
	icons/obj/storage.dmi

2015-05-29 21:45:18 +01:00

..

admin

Antagonists Will No Longer Show Up as MODE in round end reports.

2015-05-25 15:58:32 -04:00

assembly

Made a proc and fixed other buggy items.

2015-05-19 00:28:15 +01:00

awaymissions

reorganizing stray objs in /defines

2015-05-05 21:18:21 +10:00

client

Fixes #1190

2015-05-23 06:30:28 -03:00

clothing

Fixes extinguisher (w/safety off) spraying water when placed on a table.

2015-05-23 16:03:48 +02:00

crafting

more spans

2015-04-24 20:52:00 +03:00

detectivework

Fixes extinguisher (w/safety off) spraying water when placed on a table.

2015-05-23 16:03:48 +02:00

emoji

…

events

removes the "whoops you're probably going to die by no fault of your own!" races from the staff/wand of change with a new var: dangerous_existence. Currently lists shadowpeople, shadowlings and plasmamen.

2015-05-09 21:04:59 -04:00

flufftext

Fixes #9066, removes description on Noslips

2015-04-27 14:03:51 -05:00

food&drinks

Merge pull request #9616 from Jordie0608/ifhuamnityexpandstoanothersolarsystemwewillhavetorenamesunglasses

2015-05-24 23:39:40 -05:00

holiday

Fixes #9257

2015-05-05 18:50:30 +02:00

hydroponics

Fixes poppyseed mutating into tomato seeds instead of geranium/lily

2015-05-25 14:48:14 +02:00

library

Remove kitchen/utensil/spoon. Changes /kitchen/utensil stuff to simply be /kitchen.

2015-04-27 23:54:28 +02:00

lighting

Massive MC and subsystem rewrite

2015-04-29 02:00:25 -07:00

mining

Image Caches:

2015-05-14 16:40:15 +01:00

mob

Merge pull request #9665 from Jordie0608/callingspicyfoodwickeddoesntmakesensetome

2015-05-29 15:21:51 +03:00

nano

Air alarm template still needs a tweak, but it's functional now.

2015-04-25 05:22:00 +01:00

ninja

Antagonists Will No Longer Show Up as MODE in round end reports.

2015-05-25 15:58:32 -04:00

paperwork

Merge pull request #9665 from Jordie0608/callingspicyfoodwickeddoesntmakesensetome

2015-05-29 15:21:51 +03:00

power

Merge pull request #9616 from Jordie0608/ifhuamnityexpandstoanothersolarsystemwewillhavetorenamesunglasses

2015-05-24 23:39:40 -05:00

procedural mapping

minor correction.

2015-05-03 23:39:04 +01:00

projectiles

Merge pull request #9638 from CosmicScientist/EnglishFixes

2015-05-26 03:53:37 -05:00

reagents

Merge pull request #9616 from Jordie0608/ifhuamnityexpandstoanothersolarsystemwewillhavetorenamesunglasses

2015-05-24 23:39:40 -05:00

recycling

Added allow_drop() on machinery.

2015-05-16 02:36:02 +01:00

research

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

2015-05-29 21:45:18 +01:00

scripting

Fixes all possible exploits with the AI tracking href link

2015-05-22 11:26:43 -03:00

security levels

more spans

2015-04-24 20:52:00 +03:00

shuttle

compile fix

2015-05-22 18:23:25 +10:00

surgery

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

2015-05-29 21:45:18 +01:00

telesci

span fixes

2015-04-24 20:52:01 +03:00