Tastyfish f839b43bcc Merge remote-tracking branch 'origin/inputfix' into inputfix ...

Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/game/dna/genes/vg_powers.dm
	code/modules/admin/verbs/adminhelp.dm
	code/modules/economy/EFTPOS.dm
	code/modules/mob/living/silicon/robot/life.dm

2015-11-30 22:44:55 -05:00

..

admin

Merge remote-tracking branch 'origin/inputfix' into inputfix

2015-11-30 22:44:55 -05:00

alarm

…

assembly

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

atmos_automation

Circuit Board Repathing and Swarmer Fixes

2015-11-06 21:21:36 -05:00

awaymissions

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

client

Vulp tails need love.

2015-11-25 17:13:51 -05:00

clothing

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

computer3

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

crafting

Spoopy

2015-10-29 12:32:38 -04:00

customitems

…

destilery

…

detective_work

…

economy

added cancel to more powers, hand tele, cleanups to others

2015-11-30 22:30:57 -05:00

events

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

examine

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

2015-11-24 18:05:01 -05:00

ext_scripts

…

fish

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

flufftext

removes shadow thing

2015-11-14 14:34:07 -05:00

food

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

games

…

garbage_collection

Garbage Collect Everything

2015-10-13 20:23:26 -04:00

holiday

…

hydroponics

Grammar Fixes, Less Shouting (still praising)

2015-11-28 17:22:01 -05:00

jungle

Updates Panther Sprite

2015-11-18 02:00:09 -05:00

karma

…

library

…

lighting

Make placing floor plating on space actually update lighting correctly

2015-11-12 22:42:16 -05:00

liquid

…

media

Made jukebox volume update work more reliably when buffering is slow

2015-11-14 22:29:49 -05:00

mining

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

mob

Merge remote-tracking branch 'origin/inputfix' into inputfix

2015-11-30 22:44:55 -05:00

nano

fixed nanoui maps positioning stuff wrong, atmos control having any items

2015-11-29 17:50:17 -05:00

ninja

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

organs

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

paperwork

made AI tracking cancel-able, fixed folder labelling

2015-11-30 01:06:21 -05:00

pooling

…

power

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

procedural_mapping

…

projectiles

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

reagents

added input cancelling to pda msg, chemmaster ops, borg mod selection

2015-11-30 01:06:21 -05:00

recycling

Reduces Round-start Atmos Processing: Full Charge Disposals

2015-10-17 19:53:21 -04:00

research

Adds in Aloe Vera and Comfrey

2015-11-25 01:37:58 -05:00

scripting

Telecomms Refactor & CodeMirror

2015-10-28 17:23:22 -07:00

security_levels

…

shieldgen

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

shuttles

Circuit Board Repathing and Swarmer Fixes

2015-11-06 21:21:36 -05:00

space_transition

…

store

…

surgery

surgeryize me cap'n

2015-10-14 07:05:49 -04:00

telesci

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

tram

…

vehicle

-tg- pull refactor

2015-10-10 11:15:52 -07:00

virus2

Virus prob adjustment

2015-11-16 01:46:55 -05:00