DZD 0965789925 Fix merge conflicts

2015-08-21 18:38:42 -04:00

..

admin

Add mob sprites to ERT backpacks

2015-08-20 19:33:35 +02:00

alarm

Alarm system overhaul

2015-08-02 07:13:03 +02:00

assembly

isNonCrewAntag() checks, key_name fixes

2015-08-20 17:25:55 +02:00

atmos_automation

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

awaymissions

Fix incorrect icon state on BSA computer

2015-08-17 00:44:06 +02:00

client

Merge pull request #1781 from Markolie/adminbus

2015-08-18 20:19:55 -04:00

clothing

Merge pull request #1716 from Markolie/rndserver

2015-08-12 22:27:53 -04:00

computer3

Merge pull request #1742 from Markolie/ghosties

2015-08-15 15:16:10 -04:00

crafting

Kitchen Overhaul 2: Table Edition

2015-07-25 06:38:09 -04:00

customitems

Kluysfluff indentation

2015-08-11 21:52:40 +02:00

destilery

…

DetectiveWork

Detective Scanner Protolathe Production

2015-08-19 18:16:52 -04:00

economy

Bluespace artillery computer update, accounts database computer update, ghost machinery interaction update

2015-08-14 06:26:40 +02:00

events

Making TullyBBurnalot happy (AKA the dumbest grammar PR ever.)

2015-08-20 16:17:38 -05:00

ext_scripts

…

fish

…

flufftext

Changes a few del to del()

2015-07-10 23:28:08 -04:00

food

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

games

…

garbage collection

Merge pull request #1781 from Markolie/adminbus

2015-08-18 20:19:55 -04:00

genetics2

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

holiday

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

hydroponics

isNonCrewAntag() checks, key_name fixes

2015-08-20 17:25:55 +02:00

icon generation

…

jungle

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

karma

isNonCrewAntag() checks, key_name fixes

2015-08-20 17:25:55 +02:00

library

Admin teleport update, further admin message fixes

2015-08-18 00:54:25 +02:00

lighting

Further process tweaks

2015-08-08 09:07:26 -04:00

liquid

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

media

ensure the current song ends when streaming is disabled

2015-07-26 06:23:30 +02:00

mining

Consolidate ?/FLW links under key_name_admin

2015-08-17 00:13:53 +02:00

mob

Another dsay fix

2015-08-20 21:13:17 +02:00

nano

New proc to replace world.log <<, log_to_dd()

2015-08-14 18:18:57 -07:00

ninja

Fixes bad PDA tnote entries and minor PDA bugs

2015-08-14 23:33:38 -04:00

organs

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

2015-08-18 18:38:59 +02:00

paperwork

Admin teleport update, further admin message fixes

2015-08-18 00:54:25 +02:00

pooling

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

power

Merge pull request #1778 from Markolie/events

2015-08-19 17:04:14 -04:00

procedural mapping

…

projectiles

Fix merge conflicts

2015-08-21 18:38:42 -04:00

reagents

isNonCrewAntag() checks, key_name fixes

2015-08-20 17:25:55 +02:00

recycling

isNonCrewAntag() checks, key_name fixes

2015-08-20 17:25:55 +02:00

research

Merge pull request #1796 from Fox-McCloud/detective-scanner

2015-08-21 17:19:06 +02:00

scripting

Merge pull request #1766 from Markolie/adminbus

2015-08-17 18:10:38 -04:00

security levels

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

2015-08-18 20:24:10 +02:00

shieldgen

Pass II

2015-07-09 19:51:40 -04:00

shuttles

Bluespace artillery computer update, accounts database computer update, ghost machinery interaction update

2015-08-14 06:26:40 +02:00

store

Bluespace artillery computer update, accounts database computer update, ghost machinery interaction update

2015-08-14 06:26:40 +02:00

surgery

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

2015-08-18 18:38:59 +02:00

telesci

Update upgradable machinery New code

2015-07-30 22:19:32 +02:00

tram

MTTS: Delay Rails, for stations.

2015-06-24 18:05:36 -07:00

vehicle

isNonCrewAntag() checks, key_name fixes

2015-08-20 17:25:55 +02:00

virus2

IPC overhaul

2015-08-15 23:52:26 +02:00