Erthilo 8e72965077 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates ...

Conflicts:
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/grenades.dm
	code/game/objects/items/weapons/implants/implant.dm
	code/game/objects/radio/headset.dm
	code/game/objects/radio/radio.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/clothing/glasses.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/paperwork/paper.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	icons/mob/suit.dmi

2012-05-31 15:09:35 +01:00

..

alien

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-31 15:09:35 +01:00

closets

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-29 15:00:11 +01:00

devices

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-31 15:09:35 +01:00

items

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-31 15:09:35 +01:00

radio

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-31 15:09:35 +01:00

secstorage

TG: The new 'sleek' user interface is going live.

2012-05-21 20:29:35 +01:00

stacks

TG: -r-table parts are now made by using four metal rods on regular table parts.

2012-05-15 01:02:01 +01:00

storage

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-31 15:09:35 +01:00

tanks

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-31 15:09:35 +01:00

biomass.dm

As many bugfixes as I could cram into here.

2012-05-20 14:23:10 -07:00

blood.dm

…

bodybag.dm

…

bombspawner.dm

…

cleaner.dm

…

closets.dm

TG: Fix for dragging HUD elements into lockers.

2012-05-21 20:42:15 +01:00

contraband.dm

TG: Adding my stuff so I can work from my parents' computer

2012-05-01 23:48:09 +01:00

displaycase.dm

…

door_assembly.dm

TG: Added Atmos glass doors.

2012-05-23 18:05:59 +01:00

effect_system.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-29 15:00:11 +01:00

electricchair.dm

…

empulse.dm

…

explosion.dm

…

gibs.dm

Merge branch 'DetectiveWork' of https://github.com/SkyMarshal/Baystation12 into SkyMarshal-DetectiveWork

2012-05-10 16:48:01 +01:00

glowshroom.dm

…

grille.dm

Huge commit! Standardizes var definitions in most places.

2012-05-29 16:26:48 +01:00

items.dm

Cleanup of all the update_clothing() calls.

2012-05-27 20:43:52 +02:00

kitchen.dm

…

lamarr.dm

…

mineral_doors.dm

I accidentally ALL THE THINGS! But yeah, ZAS is updated.

2012-05-26 02:01:26 -06:00

new_year.dm

TG: - Removed support for the ONBACK and ONBELT flags.

2012-05-28 22:58:57 +01:00

noticeboard.dm

…

object_procs.dm

TG: AutoUpdateTK lags tremendously. TK functions as it used to before Doohl gave it

2012-05-13 00:42:09 +01:00

portals.dm

…

shooting_range.dm

TG: Modified TK to be more effective and polished. You can use the TK grab to

2012-04-25 22:22:05 +01:00

sign_decals.dm

Added some new barsigns, will soon be adding a method to choose which one you have, but only once per round.

2012-05-25 13:52:53 +01:00

stool.dm

Cleanup of all the update_clothing() calls.

2012-05-27 20:43:52 +02:00

structures.dm

TG: (Renames and repaths engineering space suits, does not replace RIG suits)

2012-05-28 23:24:55 +01:00

tables_racks.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-29 15:00:11 +01:00

tank.dm

TG: - Removed support for the ONBACK and ONBELT flags.

2012-05-28 22:58:57 +01:00

toys.dm

Added a var to a obj/effect/decal/cleanable/crayon storing the client who drew it

2012-05-27 09:01:38 +03:00

transfer_valve.dm

TG: Added new transfer valve assembly sprites from Baystation 12, and made the

2012-05-29 00:40:25 +01:00

uplinks.dm

TG: - Removed support for the ONBACK and ONBELT flags.

2012-05-28 22:58:57 +01:00

washing_machine.dm

…

watercloset.dm

TG: - Removed support for the ONBACK and ONBELT flags.

2012-05-28 22:58:57 +01:00

weapons.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-29 15:00:11 +01:00

window.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-29 15:00:11 +01:00