OrbisAnima ff73133b3a Fix: Promethean coloration error ...

Fixes #801, I tested and everything seemed to work, but given the nature
of organ_icon, I suggest someone else checks it too.

2017-01-06 15:48:54 -03: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

Some fixes.

2017-01-02 03:38:20 -05:00

clothing

Cleaning up some problems with the sync

2016-12-27 08:23:46 -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

Makes mushroom sprites show up correctly when harvested (#788)

2016-12-30 23:06:57 -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

Replaces [stack]/fifty atoms with atoms that spawn the normal stack

2016-12-17 17:27:04 -06: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

Merge remote-tracking branch 'refs/remotes/origin/master' into dev-ace

2017-01-02 03:38:29 -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

Fix: Promethean coloration error

2017-01-06 15:48:54 -03:00

overmap

…

paperwork

Polaris December Sync

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

power

Fixes lights for macros, hopefully.

2016-12-29 02:05:17 -05:00

projectiles

Voremob tweaks, bellies now escapable (#783)

2016-12-30 11:27:07 -05:00

random_map

Replaces [stack]/fifty atoms with atoms that spawn the normal stack

2016-12-17 17:27:04 -06:00

reagents

Polaris sync

2016-12-27 08:21:55 -05:00

recycling

Allows ashtrays to go in the trash.

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

research

Polaris sync

2016-12-27 08:21:55 -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

Merge pull request #778 from Screemonster/tails

2016-12-27 14:37:58 -05:00

xenoarcheaology

Voremob tweaks, bellies now escapable (#783)

2016-12-30 11:27:07 -05:00

xenobio2

Polaris December Sync

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

xgm

…