Cael_Aislinn 10034cdac4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	code/modules/clothing/suits/suit_cramp.dm
	code/modules/mob/living/carbon/human/inventory.dm

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

2012-10-29 02:19:28 +10:00

..

Rust

another partial fix

2012-10-25 21:30:26 +10:00

Supermatter

fixed kobolds (?) brought in supermatter and cleaned it up a bit

2012-10-25 20:30:40 +10:00

covershield.dmi

…

energy_field.dm

various tweaks to energy fields, energy field artifacts (some outstanding bugs still)

2012-08-06 05:13:02 +10:00

external_shield_gen.dm

tweaks to shield generators, added shield generator to the admin shuttle (would have added it to other shuttles, but most are too small)

2012-07-28 13:15:02 +10:00

meteor_battery.dm

renamed the old scanner, reorganised and cleared up some WIP stuff of mine

2012-08-25 03:34:12 +10:00

meteor_turret.dmi

missing icon file

2012-08-04 00:15:37 +10:00

sculpture.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

shield_capacitor.dm

remove debug output

2012-07-28 17:27:27 +10:00

shield_gen.dm

remove debug output

2012-07-28 17:27:27 +10:00

shielding.dmi

tweaks and fixes for shielding, relating to building and useability

2012-07-06 11:51:47 +10:00

unknown.dmi

[redacted]

2012-06-17 02:24:37 +10:00