Xhuis 5fe0762beb Conflicts 2/3

2015-09-22 16:42:34 -04:00

..

admin

Merge pull request #11883 from phil235/DnaMonkeyStuff

2015-09-22 18:43:27 +03:00

assembly

Merge pull request #11743 from Delimusca/cleanconfusion

2015-09-19 14:01:58 +01:00

awaymissions

Merge pull request #11883 from phil235/DnaMonkeyStuff

2015-09-22 18:43:27 +03:00

client

- Fixed monkey starting with no dna.

2015-09-19 22:18:28 +02:00

clothing

Merge pull request #11787 from bgobandit/theywanttherandd

2015-09-19 14:20:09 +01:00

crafting

Merge pull request #11239 from Firecage/del2qdel

2015-08-19 11:50:24 +02:00

detectivework

Merge branch 'master' of https://github.com/tgstation/-tg-station into DnaMonkeyStuff

2015-09-19 22:34:30 +02:00

emoji

…

events

Simplified update_mutations_overlay(), we no longer rebuild the entire mutation layer with all mutations every time we get or lose a mutation. I reintroduced in on_acquiring and on_losing some code similar to the old lose_indication gain_indication procs.

2015-09-22 02:14:37 +02:00

flufftext

makes all Destroy()'s return properly

2015-08-31 00:21:01 -06:00

food&drinks

- Fixed monkey starting with no dna.

2015-09-19 22:18:28 +02:00

games

Fixes proc arguments

2015-07-15 23:52:35 +02:00

holiday

buffs out a few of the bigger holidays celibration periods

2015-07-24 13:21:02 -04:00

html_interface

Modifications to crew monitoring computer, procqueue and html_interface.

2015-07-12 13:37:18 +02:00

hydroponics

Merge branch 'master' of https://github.com/tgstation/-tg-station into DnaMonkeyStuff

2015-09-19 22:34:30 +02:00

library

removes a bunch of .0

2015-09-10 20:57:30 +09:00

lighting

Fixes proc arguments

2015-07-15 23:52:35 +02:00

mining

Merge pull request #11787 from bgobandit/theywanttherandd

2015-09-19 14:20:09 +01:00

mob

Conflicts 2/3

2015-09-22 16:42:34 -04:00

nano

Fixes proc arguments

2015-07-15 23:52:35 +02:00

ninja

- Fixed monkey starting with no dna.

2015-09-19 22:18:28 +02:00

paperwork

Conflicts 3/3

2015-09-17 20:08:26 -04:00

power

Major cult changes

2015-09-16 10:04:49 +12:00

procedural mapping

Fixes proc arguments

2015-07-15 23:52:35 +02:00

projectiles

Merge pull request #11883 from phil235/DnaMonkeyStuff

2015-09-22 18:43:27 +03:00

reagents

Merge branch 'master' of https://github.com/tgstation/-tg-station into DnaMonkeyStuff

2015-09-19 22:34:30 +02:00

recycling

removes a bunch of .0

2015-09-10 20:57:30 +09:00

research

Merge pull request #11883 from phil235/DnaMonkeyStuff

2015-09-22 18:43:27 +03:00

scripting

/datum/stack replaces /stack, naming scheme redo for procs and linked_element --> linked_node

2015-08-28 16:52:22 +01:00

security levels

removes a bunch of .0

2015-09-10 20:57:30 +09:00

shuttle

Merge pull request #10798 from MrPerson/exceptions_to_help_phil_fix_potential_bugs_and_also_aran_maybe

2015-07-25 19:22:46 +10:00

space transition

Use defines instead of magic

2015-09-08 21:58:05 +03:00

surgery

Merge pull request #11742 from Aranclanos/chestAugs

2015-09-14 20:28:27 +02:00

telesci

removes a bunch of .0

2015-09-10 20:57:30 +09:00