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

Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/objects/structures/door_assembly.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/mineral_doors.dm
	code/modules/research/protolathe.dm
	icons/obj/doors/door_assembly.dmi

2014-04-11 02:51:07 +10:00

..

grenades

More qdel() changes.

2014-03-31 01:11:37 -07:00

implants

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

2014-03-08 22:03:03 -08:00

melee

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

2014-03-21 03:05:39 -07:00

storage

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

2014-04-11 02:51:07 +10:00

tanks

Fix

2014-04-04 21:06:30 +08:00

AI_modules.dm

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

2014-03-22 17:42:07 +01:00

airlock_painter.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

cards_ids.dm

Generalised ID naming

2014-04-09 18:49:59 +02:00

cigs_lighters.dm

Replaced a few more Del() and del() calls

2014-03-03 04:51:09 -08:00

clown_items.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

cosmetics.dm

…

dice.dm

now it's finished entirely \o/

2014-02-15 16:56:12 +01:00

dna_injector.dm

DNA injectors get DNA scanner's damage_coeff.

2014-03-11 09:23:41 -07:00

explosives.dm

GEE THANKS GIA FOR MORE CONFLICTS (gravitygen changes to c4 vs qdel)

2014-03-21 19:04:51 -07:00

extinguisher.dm

Added a new gravity generator which will produce gravity for the station.

2014-03-15 16:59:48 +00:00

flamethrower.dm

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

2014-03-21 03:05:39 -07:00

gift_wrappaper.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

handcuffs.dm

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

2014-03-08 22:03:03 -08:00

kitchen.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

manuals.dm

Added a new wiki manual subtype which will allow you to easily add new book/manuals which link to the wiki.

2014-02-20 17:47:33 +00:00

mop.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

paint.dm

…

paiwire.dm

…

power_cells.dm

Issues fixings

2014-02-24 15:53:24 +04:00

RCD.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

RSF.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

scrolls.dm

Fixes an issue with teleportation scrolls and mining vouchers that allow you to gain unlimited uses from them.

2014-03-02 05:00:57 -08:00

shields.dm

second pass

2014-02-15 20:11:12 -08:00

singularityhammer.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

stunbaton.dm

Stun baton buffed, classic baton buffed

2014-03-09 16:46:55 -07:00

table_rack_parts.dm

Wooden Walls

2014-04-01 18:03:02 +11:00

teleportation.dm

Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range.

2014-02-17 15:44:07 -08:00

tools.dm

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

2014-03-21 03:05:39 -07:00

twohanded.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

vending_items.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

weaponry.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00