Hubblenaut a89c066905 Fixes onmob icons for holders ...

Conflicts:
	code/game/objects/items.dm

2016-01-08 14:47:08 +01:00

..

acting

…

admin

Fixes #11783

2016-01-01 15:52:35 -05:00

alarm

Modular Computer Multitasking + Fixes

2016-01-08 01:34:30 +01:00

assembly

…

awaymissions

…

blob

Prevents blob from growing over asteroid walls

2015-12-18 07:59:49 +01:00

client

Quick fix for #11772

2016-01-07 17:01:25 -05:00

clothing

Space helmets now block hair.

2016-01-05 12:19:26 +01:00

customitems

…

detectivework

Forensics fixes/tweaks.

2015-12-10 19:34:28 +10:30

economy

Species economy modifier now defaults to human if missing.

2016-01-04 09:38:31 +01:00

events

…

examine

…

ext_scripts

…

flufftext

…

food

…

games

should realistically fix merge conflicts

2016-01-06 15:12:05 -06:00

genetics

…

ghosttrap

The binary channel will now be listed using the user's primary language key, instead of :

2015-12-28 20:37:05 +01:00

holodeck

…

hydroponics

Fixes #11661

2015-12-29 15:12:07 -06:00

icon generation

…

library

…

lighting

…

liquid

…

maps

fix issues with indented absolute path definitions

2015-12-09 14:12:54 +00:00

materials

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into NTOSv2

2015-12-29 20:25:34 +01:00

mining

Makes the mining asteroid airless again.

2015-12-30 00:13:12 -05:00

mob

Fixes onmob icons for holders

2016-01-08 14:47:08 +01:00

modular_computers

Fixes #11931 + Design bug

2016-01-08 01:55:56 +01:00

multiz

…

nano

Modular Computer Multitasking + Fixes

2016-01-08 01:34:30 +01:00

organs

It should now be possible to give species with blood IV, rather than species without blood.

2016-01-03 17:31:49 +01:00

overmap

…

paperwork

Removes suicide code.

2015-12-14 15:57:56 +01:00

power

Map fixes - Dev Edition

2016-01-07 12:34:38 +01:00

projectiles

Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis

2016-01-01 23:58:29 -05:00

random_map

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-12-13 10:47:33 +01:00

reagents

Merge pull request #11856 from atlantiscze/01-01-2015-GasAxing

2016-01-01 12:18:18 +01:00

recycling

Merge pull request #11513 from Karolis2011/Constructable_Cargo

2015-12-19 09:18:45 +03:00

research

Fixes #11931 + Design bug

2016-01-08 01:55:56 +01:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

Fixes #11681

2015-12-20 20:05:07 +03:00

supermatter

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-12-20 11:55:53 +01:00

surgery

Fixes #11916

2016-01-07 05:47:51 +03:00

tables

Scheduler, observation, and New() tweaks.

2015-12-27 17:44:53 +01:00

vehicles

…

virus2

Removes suicide code.

2015-12-14 15:57:56 +01:00

wireless

fix issues with indented absolute path definitions

2015-12-09 14:12:54 +00:00

xgm

…