PsiOmega fde03b2e94 Containers now properly checks types instead of string paths. ...

Security and medical belts could contain now no longer existing objects. These types have been removed.

Conflicts:
	code/game/objects/items/weapons/storage/belt.dm
	code/game/objects/structures/inflatable.dm
	code/modules/clothing/under/ties.dm

2015-02-14 14:16:40 +01:00

..

admin

Merge master into dev.

2015-02-12 23:01:08 +10:30

assembly

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

awaymissions

Conflict fix

2015-02-03 20:57:16 +03:00

client

Accessories update.

2015-02-08 12:35:50 +03:00

clothing

Replaces text expressions with macros

2015-02-12 01:55:12 -05:00

customitems

Merge pull request #8098 from MrSnapwalk/TheseArmsWereMadeForClamping

2015-02-10 09:23:47 +03:00

detectivework

Merge pull request #7964 from Baystation12/dev-freeze

2015-02-02 02:14:08 +10:30

distillery

Fixes typos and indenting present in the destilery module, and renames it to distillery

2015-01-09 20:49:36 +06:00

economy

Merge resolution.

2015-01-12 07:17:02 +10:30

events

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

2015-02-03 15:18:27 -08:00

ext_scripts

…

flufftext

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

food

Replaces uplink Donk-pockets with Sin-Pockets.

2015-02-11 09:55:50 +01:00

games

…

genetics

…

holodeck

Missing files added

2015-02-04 20:40:39 +08:00

hydroponics

Merge master into dev.

2015-02-12 23:01:08 +10:30

icon generation

Cleanup helper files maths.dm, time.dm, type2type.dm, add macros for bit-manipulation

2015-01-09 21:55:11 +06:00

library

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

liquid

…

maps

* Made the preloader independant of the called New().

2014-12-23 23:47:30 +01:00

mining

Merge master into dev.

2015-02-12 23:01:08 +10:30

mob

Adds missing Event cost stat.

2015-02-13 09:43:18 +01:00

nano

pAI rework

2015-02-09 01:58:54 +00:00

organs

Antibodies rework.

2015-01-26 05:32:00 +00:00

overmap

Compile fix

2015-02-03 08:39:39 +03:00

paperwork

Containers now properly checks types instead of string paths.

2015-02-14 14:16:40 +01:00

power

Merge master into dev.

2015-02-12 23:01:08 +10:30

projectiles

Adds 9mm gun with silencer, 5TC, with the option to acquire additional ammo, 2TC.

2015-02-10 22:39:40 +01:00

random_map

Readded asteroid secret placement, adjusted some values.

2015-01-23 13:40:10 +10:30

reagents

Adds a kit with cigarette packs and zippo lighter.

2015-02-12 16:35:49 +01:00

recycling

Merge master into dev.

2015-02-12 23:01:08 +10:30

research

Containers now properly checks types instead of string paths.

2015-02-14 14:16:40 +01:00

scripting

…

security levels

…

shieldgen

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

shuttles

Updates references

2014-12-27 00:03:20 +01:00

supermatter

Supermatter warning now has its own proc. Fixed some SM bugs.

2014-11-30 00:23:55 +01:00

surgery

Merge pull request #7844 from Kelenius/ofDryingAndRacks

2015-02-04 18:15:13 +03:00

vehicles

New bullet types, projectile rewrite

2015-02-06 20:09:32 -05:00

virus2

Fixes startup runtime

2015-02-06 08:54:28 +00:00