as334 a6eaf76d72 Fixes merge conflicts, adds new sprites, hopefully fixes weird helmet sprite bug.

2015-11-12 21:54:08 -05:00

..

admin

Merge pull request #12791 from KorPhaeron/removelizardremovelizard

2015-11-11 13:20:49 -06:00

assembly

Revenant changes XVIII

2015-11-05 18:50:51 -05:00

awaymissions

Fixes merge conflicts, adds new sprites, hopefully fixes weird helmet sprite bug.

2015-11-12 21:54:08 -05:00

client

Merge pull request #12916 from tkdrg/ripinpiss

2015-11-09 02:56:41 -03:00

clothing

Fixes merge conflicts, adds new sprites, hopefully fixes weird helmet sprite bug.

2015-11-12 21:54:08 -05:00

crafting

Makes it so only advanced tool users can use tablecrafting.

2015-10-27 02:01:47 +02:00

detectivework

…

emoji

…

events

Merge remote-tracking branch 'upstream/master' into fuk

2015-11-07 15:56:39 -03:00

flufftext

…

food&drinks

Merge pull request #12924 from Firecage/Optable

2015-11-11 17:31:38 +01:00

games

…

holiday

…

html_interface

…

hydroponics

Fixes being able to stun AI and MMI forever with flashbang, preventing them from using their mech. Brain mobs can no longer get flashed or flashbanged. Silicons are no longer affected by the sound bang of the flashbang (since they have no ears).

2015-11-10 22:06:54 +01:00

library

You saw nothing

2015-11-01 11:40:14 -05:00

lighting

Improves speed of redraw_lighting()

2015-11-06 23:36:03 -03:00

mining

…

mob

Fixes merge conflicts, adds new sprites, hopefully fixes weird helmet sprite bug.

2015-11-12 21:54:08 -05:00

nano

…

ninja

Merge remote-tracking branch 'upstream/master' into fuk

2015-11-07 15:56:39 -03:00

paperwork

makes sleepypens refillable

2015-11-02 17:41:35 -08:00

power

Ghost HUD tweaks

2015-11-08 22:53:41 -03:00

procedural mapping

…

projectiles

Merge pull request #12805 from KorPhaeron/xray

2015-11-10 18:14:47 -06:00

reagents

Merge pull request #12950 from phil235/AIMechStunFix

2015-11-11 16:34:24 -06:00

recycling

Merge pull request #12552 from KorPhaeron/disposals

2015-11-07 06:16:41 +03:00

research

Fixes merge conflicts, adds new sprites, hopefully fixes weird helmet sprite bug.

2015-11-12 21:54:08 -05:00

security levels

…

shuttle

Fixes shuttle docking ports being acted upon by the singulo

2015-11-01 12:03:50 -08:00

space transition

…

surgery

Merge pull request #12924 from Firecage/Optable

2015-11-11 17:31:38 +01:00

telesci

…

tooltip

…