Crazy Lemon 9979fda3c0 Merge pull request #6525 from tigercat2000/4ucking4urries ...

Nerfs sentient AI in our code

2017-02-20 20:03:38 -08:00

..

admin

Merge branch 'master' into admin_interact

2017-02-18 15:41:16 +01:00

alarm

…

arcade

Fixes up battle terminal connections

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

assembly

…

atmos_automation

…

awaymissions

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

2017-02-11 18:26:06 +01:00

client

Merge branch 'master' into admin_interact

2017-02-18 15:41:16 +01:00

clothing

Fixes some sounds not being cached properly

2017-02-17 02:37:26 -05:00

computer3

Merge remote-tracking branch 'upstream/master' into botany-rework

2017-01-23 01:01:09 -05:00

countdown

…

crafting

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

2017-02-06 05:35:59 -05:00

customitems

Adds a fluff item for ComputerlessCitizen

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

detective_work

Fixes some sounds not being cached properly

2017-02-17 02:37:26 -05:00

economy

Fixes some sounds not being cached properly

2017-02-17 02:37:26 -05:00

error_handler

…

events

Merge pull request #6455 from Crazylemon64/smart_kudzu

2017-02-17 12:31:05 -05:00

examine

…

ext_scripts

…

fish

fixes, comfrey, and aloe

2017-01-23 05:25:42 -05:00

flufftext

…

food_and_drinks

Merge remote-tracking branch 'upstream/master' into advanced-camera-fixup

2017-02-12 09:44:07 -05:00

garbage_collection

Removes Oudated GC Info

2017-01-30 03:01:29 -05:00

holiday

…

hydroponics

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

2017-02-12 00:03:49 +01:00

karma

…

library

Improve View Flagged Books admin verb

2017-02-12 08:44:48 -08:00

lighting

Lighting now states which atom is missing a light_sources list on

2017-02-17 23:07:43 -08:00

logic

…

martial_arts

…

mining

Proper fix for minebot damage issue

2017-02-15 17:23:57 +01:00

mob

Merge pull request #6483 from tigercat2000/ai_open

2017-02-20 09:48:01 -05:00

nano

Fixes both pai resting jankiness, pai body re-entering

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

ninja

…

paperwork

Merge branch 'master' into admin_interact

2017-02-18 15:41:16 +01:00

pda

Adds a ui_key arg to ui_data

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

persistence

…

power

Adds JMP link

2017-02-12 01:23:30 -08:00

procedural_mapping

…

projectiles

Merge pull request #6478 from FlattestGuitar/lasers

2017-02-18 11:07:56 -05:00

reagents

~~Removes~~ Nerfs sentient AI in our code

2017-02-19 15:37:23 -08:00

recycling

Fix slicing disposal pipes not showing a progress bar

2017-02-18 15:58:38 +01:00

research

Fixes some sounds not being cached properly

2017-02-17 02:37:26 -05:00

ruins

…

scripting

…

security_levels

Merge pull request #5814 from Markolie/ann2

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

shuttle

Some changes!

2017-02-18 22:18:01 -02:00

space_management

…

spacepods

Fixes some sounds not being cached properly

2017-02-17 02:37:26 -05:00

station_goals

The BSA goal will no longer choke on the z2 BSA

2017-02-17 23:29:33 -08:00

store

…

surgery

Fixes some sounds not being cached properly

2017-02-17 02:37:26 -05:00

telesci

…

tooltip

…

tram

Switches over to the new system

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

vehicle

…