kingofkosmos 228b4282ca Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1 ...

# Conflicts:
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/modules/mob/dead/new_player/new_player.dm

2019-10-13 15:21:17 +03:00

..

ballistic

Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1

2019-10-13 15:21:17 +03:00

energy

Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525)

2019-10-08 11:06:02 -04:00

magic

Kills obj/item/projectile in favour of obj/projectile (#46692)

2019-10-06 13:37:24 -04:00

misc

Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525)

2019-10-08 11:06:02 -04:00

ballistic.dm

Removes excess spaces in messages.

2019-10-13 14:36:43 +03:00

energy.dm

Removes excess spaces in messages.

2019-10-13 14:36:43 +03:00

magic.dm

remove duplicate var definitions in /obj/item/gun/magic

2019-10-09 00:13:11 +01:00