Fox McCloud cb0973346b Merge pull request #4766 from Kyep/parole ...

Parole

2016-07-16 11:35:37 -04:00

..

admin

Merge pull request #5041 from DaveTheHeadcrab/plastique_is_fun

2016-07-16 04:07:12 -04:00

alarm

Mass replace

2016-07-07 19:34:02 -07:00

arcade

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

assembly

Merge pull request #4971 from monster860/datum_browserify

2016-07-16 08:52:18 -04:00

atmos_automation

Mass replace

2016-07-07 19:34:02 -07:00

awaymissions

Merge pull request #4780 from Crazylemon64/space_ruins

2016-07-15 22:55:51 -04:00

client

Removes errors, errors.

2016-07-16 10:54:41 +02:00

clothing

Merge pull request #4766 from Kyep/parole

2016-07-16 11:35:37 -04:00

computer3

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

crafting

Mass replace

2016-07-07 19:34:02 -07:00

customitems

Minor Fix

2016-07-13 23:06:35 -04:00

detective_work

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

economy

Merge pull request #4971 from monster860/datum_browserify

2016-07-16 08:52:18 -04:00

error_handler

Improves caught exception logging

2016-07-14 15:44:28 -04:00

events

Mass replace

2016-07-07 19:34:02 -07:00

examine

Goonchat (#4744)

2016-06-23 16:56:15 -04:00

ext_scripts

…

fish

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

flufftext

Plastic Explosives Update

2016-07-13 22:04:23 -04:00

food

Merge pull request #4838 from FalseIncarnate/paradise_pop

2016-07-14 23:58:24 -04:00

garbage_collection

Improves caught exception logging

2016-07-14 15:44:28 -04:00

holiday

tweaks

2016-07-02 01:45:44 -04:00

hydroponics

Merge pull request #4691 from taukausanake/plant_hud

2016-07-15 21:47:36 -04:00

karma

Mass replace

2016-07-07 19:34:02 -07:00

library

Merge pull request #4780 from Crazylemon64/space_ruins

2016-07-15 22:55:51 -04:00

lighting

Fixes a bug involving a map template resetting the map loader's

2016-07-06 22:51:48 -07:00

logic

Fix all of the merge conflicts and lacking to_chats with 4041

2016-04-05 21:16:52 -07:00

martial_arts

Moves Check to human_attackhand.dm

2016-07-09 03:04:07 -05:00

media

Merge pull request #4780 from Crazylemon64/space_ruins

2016-07-15 22:55:51 -04:00

mining

Merge pull request #5054 from Fox-McCloud/mining-tweaks

2016-07-16 10:57:54 -04:00

mob

Merge pull request #5041 from DaveTheHeadcrab/plastique_is_fun

2016-07-16 04:07:12 -04:00

nano

Mass replace

2016-07-07 19:34:02 -07:00

ninja

Mass replace

2016-07-07 19:34:02 -07:00

paperwork

Merge pull request #4971 from monster860/datum_browserify

2016-07-16 08:52:18 -04:00

pda

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

pooling

Mass replace

2016-07-07 19:34:02 -07:00

power

Merge pull request #4780 from Crazylemon64/space_ruins

2016-07-15 22:55:51 -04:00

procedural_mapping

Mass replace

2016-07-07 19:34:02 -07:00

projectiles

Various Mining Tweaks

2016-07-14 22:07:04 -04:00

reagents

Merge pull request #4971 from monster860/datum_browserify

2016-07-16 08:52:18 -04:00

recycling

Mass replace

2016-07-07 19:34:02 -07:00

research

Merge pull request #4691 from taukausanake/plant_hud

2016-07-15 21:47:36 -04:00

ruins

Adds a system to give each ruin a separate area

2016-06-25 01:44:08 -07:00

scripting

Goonchat (#4744)

2016-06-23 16:56:15 -04:00

security_levels

Mass replace

2016-07-07 19:34:02 -07:00

shuttle

Merge pull request #4780 from Crazylemon64/space_ruins

2016-07-15 22:55:51 -04:00

space_transition

…

spacepods

Merge pull request #4971 from monster860/datum_browserify

2016-07-16 08:52:18 -04:00

spacial_allocator

Spaces to tabs

2016-07-09 11:57:56 -07:00

store

Adds a banner/flag for the Drask, like the other races have

2016-05-06 20:50:31 -07:00

surgery

Merge pull request #4841 from DaveTheHeadcrab/grey_speech_fix

2016-07-11 23:13:38 -04:00

telesci

bluespace crystals

2016-07-15 05:29:31 -04:00

tooltip

Mass replace

2016-07-07 19:34:02 -07:00

tram

…

vehicle

Stops vehicles unintentionally being space vehicles (#4805)

2016-06-28 15:55:14 -04:00