Fox McCloud 2af1f9bb79 Merge pull request #6185 from Allfd/Enforcer ...

Ports Enforcer handgun, rubber bullets, and new shotgun ammo boxes from Stratus

2017-01-23 06:08:36 -05:00

..

admin

Ports over tg's map conflict helping script

2017-01-18 20:27:00 -08:00

alarm

…

arcade

Fixes up battle terminal connections

2016-12-30 00:12:02 -05:00

assembly

…

atmos_automation

…

awaymissions

Merge pull request #5814 from Markolie/ann2

2017-01-18 19:17:30 -08:00

client

Reduced redundancy.

2017-01-18 19:39:49 -05:00

clothing

Removes the joy mask

2017-01-12 16:19:12 +13:00

computer3

Announcement fixes

2017-01-19 15:12:20 +01:00

countdown

…

crafting

Fixes ED-209 Crafting Oversight

2016-12-13 09:15:03 -05:00

customitems

Adds a fluff item for ComputerlessCitizen

2017-01-10 14:31:27 +01:00

detective_work

…

economy

Adds a ui_key arg to ui_data

2016-12-31 12:51:07 -08:00

error_handler

…

events

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2

2016-12-23 19:04:35 +01:00

examine

…

ext_scripts

…

fish

…

flufftext

…

food_and_drinks

Merge pull request #6149 from FlattestGuitar/log-upgrade

2017-01-18 19:13:50 -08:00

garbage_collection

…

holiday

…

hydroponics

Switches over to the new system

2017-01-17 13:57:07 +01:00

karma

…

library

Makes new book sprites available for Bookbinder

2017-01-16 19:43:14 +01:00

lighting

…

logic

…

martial_arts

…

mining

Mining drones now are able to use meson sight again

2017-01-10 23:37:49 -08:00

mob

Merge pull request #6149 from FlattestGuitar/log-upgrade

2017-01-18 19:13:50 -08:00

nano

Fixes both pai resting jankiness, pai body re-entering

2017-01-09 15:14:26 -08:00

ninja

…

paperwork

Merge pull request #5814 from Markolie/ann2

2017-01-18 19:17:30 -08:00

pda

Adds a ui_key arg to ui_data

2016-12-31 12:51:07 -08:00

persistence

…

pooling

…

power

Merge pull request #6145 from AndriiYukhymchak/teg_reworks

2017-01-18 19:04:10 -08:00

procedural_mapping

…

projectiles

Merge pull request #6185 from Allfd/Enforcer

2017-01-23 06:08:36 -05:00

reagents

Merge pull request #6149 from FlattestGuitar/log-upgrade

2017-01-18 19:13:50 -08:00

recycling

Merge pull request #6149 from FlattestGuitar/log-upgrade

2017-01-18 19:13:50 -08:00

research

Merge pull request #6149 from FlattestGuitar/log-upgrade

2017-01-18 19:13:50 -08:00

ruins

…

scripting

…

security_levels

Merge pull request #5814 from Markolie/ann2

2017-01-18 19:17:30 -08:00

shuttle

Merge pull request #5814 from Markolie/ann2

2017-01-18 19:17:30 -08:00

space_management

…

spacepods

Switches over to the new system

2017-01-17 13:57:07 +01:00

store

…

surgery

Merge pull request #6149 from FlattestGuitar/log-upgrade

2017-01-18 19:13:50 -08:00

telesci

…

tooltip

…

tram

Switches over to the new system

2017-01-17 13:57:07 +01:00

vehicle

…