duncathan salt fe16c5b50f Merge pull request #14333 from KorPhaeron/venus_human_trap ...

Fixes venus human traps killing eachother

2016-01-04 20:26:10 +01:00

..

admin

Merge pull request #14311 from MrStonedOne/patch-115

2016-01-03 21:04:45 -03:00

assembly

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00

awaymissions

Merge pull request #14286 from KorPhaeron/cheribucks_secured

2016-01-03 02:58:22 -03:00

client

Merge conflic fix

2016-01-03 14:51:14 -08:00

clothing

Merge pull request #14151 from SouDescolado/patch-1

2015-12-30 18:12:09 -03:00

crafting

Lizard hats

2015-12-29 13:01:13 -06:00

detectivework

…

emoji

…

events

Moves spawn to weather

2016-01-02 23:21:46 -06:00

flufftext

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00

food&drinks

Merge pull request #14219 from KorPhaeron/bottle

2016-01-02 16:14:00 -06:00

games

…

holiday

…

holodeck

…

html_interface

Fixed 'in' precedence errors.

2015-12-29 17:16:09 -07:00

hydroponics

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00

json

…

library

Sneaks in a new book sprite that's totally white colored, no blue dot.

2015-12-29 16:01:14 -05:00

lighting

…

mining

Merge pull request #14337 from AnturK/miningbot

2016-01-04 20:23:23 +01:00

mob

Merge pull request #14333 from KorPhaeron/venus_human_trap

2016-01-04 20:26:10 +01:00

ninja

…

paperwork

Detectives camera is now a subtype. Changed maps to have the subtype instead of the modified regular camera.

2016-01-03 07:36:12 -05:00

power

Merge conflic fix

2016-01-03 14:51:14 -08:00

procedural mapping

…

projectiles

Merge conflic fix

2016-01-03 14:51:14 -08:00

reagents

Merge conflic fix

2016-01-03 14:51:14 -08:00

recycling

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00

research

Matter bin description grammar fix

2015-12-31 22:52:03 -06:00

ruins

…

security levels

…

shuttle

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00

space transition

…

surgery

Merge pull request #14159 from somnium13/fix-in-prec

2015-12-30 22:38:13 -03:00

telesci

…

tgui

Add window locking system/sanity checks

2016-01-03 10:43:03 -06:00

tooltip

…

vehicles

Formalises Path Compatibility

2015-12-28 22:20:33 +00:00