Swag McYolosteinen f7c7faad06 Merge pull request #10291 from RemieRichards/get_apc()-NotShitVersion ...

Fixes get_apc() being shit

2015-07-01 10:33:12 +02:00

..

admin

Merge pull request #10202 from nullstation/hi-extended

2015-07-01 05:59:39 +01:00

assembly

Merge from upstream.

2015-06-25 20:30:19 +02:00

awaymissions

code improvement and overlays for fancy storage, dropper, syringe and lighter

2015-06-10 18:58:19 +10:00

client

Minimap support for the crew monitoring computer.

2015-06-28 23:00:39 +02:00

clothing

Merge pull request #10211 from Ikarrus/burntweaks

2015-06-29 21:38:20 -05:00

crafting

Merge from upstream.

2015-06-25 20:30:19 +02:00

detectivework

Merge from upstream.

2015-06-25 20:30:19 +02:00

emoji

…

events

Merge pull request #10238 from Incoming5643/catgirls2015

2015-06-29 21:44:39 -05:00

flufftext

Merge from upstream.

2015-06-25 20:30:19 +02:00

food&drinks

Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix

2015-06-28 15:22:21 +02:00

games

- Crew monitoring computer using the html_interface module

2015-06-27 10:26:46 +02:00

holiday

…

html_interface

Minimap support for the crew monitoring computer.

2015-06-28 23:00:39 +02:00

hydroponics

Merge branch 'master' of https://github.com/tgstation/-tg-station into gangnerf

2015-06-28 08:30:00 -06:00

library

Squashed Commits

2015-06-27 00:09:16 -06:00

lighting

…

mining

Moves clothes from out of equipment lockers and into wardrobe closets

2015-06-27 17:22:02 -06:00

mob

Merge pull request #10202 from nullstation/hi-extended

2015-07-01 05:59:39 +01:00

nano

Merge from upstream.

2015-06-25 20:30:19 +02:00

ninja

Merge from upstream.

2015-06-25 20:30:19 +02:00

paperwork

Resolved Conflicts:

2015-06-27 00:17:02 -06:00

power

area/proc/get_apc() is no longer shit and does not lag (AT ALL) on large areas anymore, the new method stores a list of all APCs in the world, and checks if their area var is equal to the area get_apc() was called on.

2015-06-30 12:20:28 +01:00

procedural mapping

Merge from upstream.

2015-06-25 20:30:19 +02:00

projectiles

Merge from upstream.

2015-06-25 20:30:19 +02:00

reagents

Merge pull request #10266 from phil235/SpaceDrugOverdoseTweak

2015-06-30 11:02:15 -05:00

recycling

Squashed Commits

2015-06-27 00:09:16 -06:00

research

Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix

2015-06-28 15:22:21 +02:00

scripting

Merge from upstream.

2015-06-25 20:30:19 +02:00

security levels

…

shuttle

Merge from upstream.

2015-06-25 20:30:19 +02:00

surgery

Merge pull request #10105 from xxalpha/chief

2015-06-26 19:03:13 +02:00

telesci

Fixes telesci console icon

2015-06-26 17:03:29 +03:00