Aurorablade 83d3e392ae Revert "OMG CONFLICT R GRIFFING ME HALP" ...

This reverts commit fd65c752bf.

2016-03-18 20:40:54 -04:00

..

admin

Merge pull request #3744 from Crazylemon64/human_icons_tweak

2016-03-03 20:38:18 -05:00

alarm

…

arcade

Prize Counter and Toy Fixes

2016-02-27 11:06:42 -05:00

assembly

Also stops ghosts from triggering infra

2016-02-26 22:03:37 -05:00

atmos_automation

…

awaymissions

beachy beach

2016-02-27 18:07:21 -05:00

client

Merge pull request #3765 from tigercat2000/watchlist

2016-03-06 12:58:33 -05:00

clothing

Merge pull request #3802 from Tastyfish/chronx100

2016-03-10 03:54:19 -05:00

computer3

…

crafting

…

customitems

isliving use fix

2016-03-08 23:59:41 -05:00

detective_work

more sounds

2016-03-08 22:35:31 -05:00

economy

more sounds

2016-03-08 22:35:31 -05:00

events

Fixes several midround antag assignments not asking ghosts first

2016-03-07 03:03:45 -05:00

examine

…

ext_scripts

…

fish

…

flufftext

…

food

Merge pull request #2903 from Aurorablade/OrganRefactor

2016-03-04 19:51:50 -05:00

garbage_collection

…

holiday

…

hydroponics

more sounds

2016-03-08 22:35:31 -05:00

karma

…

library

more sounds

2016-03-08 22:35:31 -05:00

lighting

…

media

Fixes jukebox actually using preferences (Volume and Head Streaming)

2016-02-24 00:22:37 -05:00

mining

Merge pull request #3767 from Tastyfish/silence

2016-03-08 19:32:29 -05:00

mob

removes somethings...

2016-03-18 14:06:36 -04:00

nano

…

ninja

pda refactor

2016-02-12 03:24:21 -05:00

paperwork

more sounds

2016-03-08 22:35:31 -05:00

pda

Fixes some paper scanner stuff

2016-03-09 01:25:31 -05:00

pooling

…

power

meanwhile as i driver tiger INSANE

2016-02-25 16:17:39 -05:00

procedural_mapping

…

projectiles

Merge pull request #3805 from Fox-McCloud/science-nerf

2016-03-10 19:16:38 -05:00

reagents

Merge pull request #3813 from Aurorablade/Ialsoownyourspleen

2016-03-10 03:56:30 -05:00

recycling

…

research

Merge pull request #3805 from Fox-McCloud/science-nerf

2016-03-10 19:16:38 -05:00

scripting

…

security_levels

…

shuttle

…

space_transition

…

store

…

surgery

Revert "OMG CONFLICT R GRIFFING ME HALP"

2016-03-18 20:40:54 -04:00

telesci

…

tram

…

vehicle

Allows wheelchairs, janicarts, and ambulances to open doors

2016-02-26 00:54:38 -05:00

virus2

more sounds

2016-03-08 22:35:31 -05:00