Spades b6056f599b Merge pull request #758 from Cameron653/master ...

Special Stomach Interactions

2016-12-13 21:52:23 -05:00

..

admin

Polaris December Sync

2016-12-10 09:51:11 -05:00

alarm

…

assembly

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

awaymissions

Symbol fix (#637)

2016-10-09 20:05:49 -04:00

blob

…

client

Polaris December Sync

2016-12-10 09:51:11 -05:00

clothing

Fixes dresses

2016-12-11 18:27:23 -05:00

customitems

…

detectivework

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

economy

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

error_handler

September Polaris Sync (#545)

2016-09-11 19:52:40 -04:00

events

Polaris December Sync

2016-12-10 09:51:11 -05:00

examine

Late September Sync (#579)

2016-09-24 14:12:43 -04:00

ext_scripts

…

flufftext

This fixes a bunch of things so here's each file change and why:

2016-10-20 16:34:34 -04:00

food

…

gamemaster

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

games

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

genetics

…

ghosttrap

…

holodeck

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

hydroponics

Fixes invisible size shrooms

2016-12-13 21:14:02 -05:00

icon generation

…

integrated_electronics

More merge conflict fixing that didn't happen before, plus fix rolling down khi jumpsuits, and change my own spacesuit

2016-10-21 00:18:46 -04:00

library

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

lighting

…

maps

…

materials

Makes clipboards producible out of wood

2016-11-12 01:26:20 +00:00

metric

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

mining

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

mob

Refactor

2016-12-10 15:43:59 -05:00

multiz

Late September Sync (#579)

2016-09-24 14:12:43 -04:00

nano

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

organs

Polaris December Sync

2016-12-10 09:51:11 -05:00

overmap

…

paperwork

Polaris December Sync

2016-12-10 09:51:11 -05:00

power

Polaris December Sync

2016-12-10 09:51:11 -05:00

projectiles

Polaris December Sync

2016-12-10 09:51:11 -05:00

random_map

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

reagents

Polaris December Sync

2016-12-10 09:51:11 -05:00

recycling

Allows ashtrays to go in the trash.

2016-11-15 19:12:19 -06:00

research

Polaris December Sync

2016-12-10 09:51:11 -05:00

scripting

Late September Sync (#579)

2016-09-24 14:12:43 -04:00

security levels

September Polaris Sync (#545)

2016-09-11 19:52:40 -04:00

shieldgen

…

shuttles

Late September Sync (#579)

2016-09-24 14:12:43 -04:00

spells

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

supermatter

Supermatter now uses the global announcer.

2016-11-19 01:08:46 +00:00

surgery

Lungs that are repaired will stop causing oxyloss

2016-11-27 16:50:17 -06:00

tables

…

vehicles

Fixes w_class of items to be consistent with Polaris update (#636)

2016-10-09 19:23:10 -04:00

ventcrawl

No longer able to crawl through welded vents.

2016-11-15 20:56:58 -06:00

virus2

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

vore

Adds warnings, since I can't figure out a fix.

2016-12-13 16:36:04 -05:00

xenoarcheaology

Polaris December Sync

2016-12-10 09:51:11 -05:00

xenobio2

Polaris December Sync

2016-12-10 09:51:11 -05:00

xgm

…