Cael_Aislinn 7efc1aafef Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	icons/turf/areas.dmi
	maps/RandomZLevels/stationCollision.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2013-01-07 22:26:24 +10:00

..

grenades

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

implants

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2013-01-07 22:26:24 +10:00

secstorage

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

storage

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

tanks

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

AI_modules.dm

Issue #1818 - Freeform Module broken again

2012-11-10 16:53:39 +00:00

cards_ids.dm

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

cigs_lighters.dm

Fixes to lighting

2012-11-29 23:01:51 +00:00

clown_items.dm

File structure again.

2012-08-26 05:20:27 +00:00

cosmetics.dm

Fixes issue 955. (Signalers don't update bomb overlays)

2012-09-23 15:31:01 +00:00

dice.dm

You can carve out books with a pair of wirecutters or a kitchen knife to create a handy hiding place.

2012-11-15 20:15:49 +00:00

dna_injector.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

explosives.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

extinguisher.dm

Changed the AI's intercoms around a bit.

2012-08-26 04:16:37 +00:00

flamethrower.dm

-Killed the updateDialog lag. I added a check to see if there were any mobs to update, if not it will stop checking until a user uses the machine again. I had to replace all the machine = src and machine = null with procs to help make it manageable. I believe this is one of the culprits causing the server to lag as the round goes on, as more players will interact with machines.

2012-10-25 19:15:51 +00:00

game_kit.dm

…

gift_wrappaper.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

handcuffs.dm

Sending a message should no longer work if you are incapacitated. Fixes issue 1120.

2012-11-25 00:28:47 +00:00

hydroponics.dm

Description fix for posibrains, reset timer on posibrain search, minor fix for Gau's seedbag.

2013-01-06 12:20:51 -08:00

kitchen.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

manuals.dm

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

mop.dm

Fixes issue 950. (tele-mopping of floors)

2012-09-23 14:14:22 +00:00

paint.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

paiwire.dm

…

RCD.dm

-Changed turf creations, merging everything to only one proc

2012-11-13 13:39:00 +00:00

RSF.dm

Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.

2012-08-18 16:33:40 +00:00

scrolls.dm

-Chemical implants can now hold 50 units instead of 10.

2012-11-15 08:03:05 +00:00

stunbaton.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

surgery_limbattachment.dm

Ported limb selection.

2012-10-17 20:08:34 +02:00

surgery_tools.dm

Removed the alertness level thing for carp/hostile mobs in general. Neat idea in theory, but in practice it just meant people could run up and beat carp to death before they'd even enter their hostile state. Bears still have it though.

2012-11-13 03:22:07 +00:00

swords_axes_etc.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

syndie.dm

…

table_rack_parts.dm

Fixes issue 954.

2012-10-05 21:17:04 +00:00

teleportation.dm

Merge branch 'incremental_tg' r4967 (27/10/2012) into bs12_with_tgport

2012-12-28 01:07:36 +10:00

tools.dm

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

trashbag.dm

Fixes issue 1097. Shaft Miners not getting pda

2012-11-21 17:17:00 +00:00

twohanded.dm

File structure again.

2012-08-26 05:20:27 +00:00

wires.dm

Merge tgstation13 r4570 into bs12_with_tgport

2012-08-28 19:57:11 +10:00