Kelenius 536388978f Conflict fix

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

..

admin

Conflict fix

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

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

Merge pull request #7591 from mwerezak/custom-item

2015-02-03 18:09:44 +03:00

clothing

Stupid typo & missing constants

2015-02-03 18:44:26 +03:00

customitems

Removes FPRINT and TABLEPASS flags

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

destilery

…

detectivework

Merge pull request #7964 from Baystation12/dev-freeze

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

economy

Merge resolution.

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

events

Fixes up some helpers.

2015-02-03 03:18:34 -07:00

ext_scripts

…

flufftext

…

food

Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)

2014-12-23 17:38:05 +10:30

games

…

genetics

…

hydroponics

Conflict fix

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

icon generation

…

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 pull request #7902 from Kelenius/ofCratesAndMastermind

2015-02-03 18:15:35 +03:00

mob

Conflict fix

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

nano

Merge pull request #7617 from fira/obscomps

2015-02-03 18:12:16 +03:00

organs

Merge pull request #7850 from Baystation12/master

2015-01-16 14:23:03 +03:00

overmap

Compile fix

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

paperwork

copytext() check for some input

2015-02-01 23:16:04 +03:00

power

Merge pull request #7617 from fira/obscomps

2015-02-03 18:12:16 +03:00

projectiles

copytext() check for some input

2015-02-01 23:16:04 +03:00

reagents

Conflict fix

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

recycling

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

2015-02-03 14:51:54 +01:00

research

Merge pull request #7801 from Mloc/bs12-glowypipes

2015-02-03 18:12:09 +03: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

…

surgery

Merge branch 'dev' into ofDryingAndRacks

2015-02-03 20:51:27 +03:00

vehicles

Merge pull request #7801 from Mloc/bs12-glowypipes

2015-02-03 18:12:09 +03:00

virus2

Merge pull request #7924 from Kelenius/ofTablesAndPass

2015-01-30 16:17:41 +03:00