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

..

equipment

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

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

laborcamp

Adds missing spans, missing periods and missing span endings. Also changes spans to suit the situation better.

2019-10-12 19:34:11 +03:00

lavaland

Adds missing spans, missing periods and missing span endings. Also changes spans to suit the situation better.

2019-10-12 19:34:11 +03:00

abandoned_crates.dm

Cynic Ruins The Game Part 3: Abandoned Crates Modpack (#46906)

2019-10-09 10:06:40 +13:00

aux_base_camera.dm

playsound vary boolean define conversion (#46254)

2019-08-30 18:45:20 +12:00

aux_base.dm

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

fulton.dm

Adds missing spans, missing periods and missing span endings. Also changes spans to suit the situation better.

2019-10-12 19:34:11 +03:00

machine_processing.dm

[READY] Floydmats (Datum materials) & custom toolboxes (#45118)

2019-07-24 11:27:01 -04:00

machine_redemption.dm

Adds missing spans, missing periods and missing span endings. Also changes spans to suit the situation better.

2019-10-12 19:34:11 +03:00

machine_silo.dm

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

machine_stacking.dm

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

machine_unloading.dm

Remove redundant anchored=TRUE from machines

2018-05-27 19:23:37 -07:00

machine_vending.dm

Removes excess spaces in messages.

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

mine_items.dm

Clothing /under repath (#45548)

2019-07-30 19:20:21 +12:00

minebot.dm

Personal interaction messages to simple animals (#46744)

2019-10-07 21:18:42 +02:00

mint.dm

fix (#46999)

2019-10-09 20:00:28 -04:00

money_bag.dm

Makes hybrid the main sprite & prob(20) alt sprite

2019-09-18 01:41:09 +02:00

ores_coins.dm

extra icon_state -> item_state on /obj/item/stack/ore/gold & /obj/item/stack/ore/glass/basalt

2019-10-08 23:43:28 +01:00

satchel_ore_boxdm.dm

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

shelters.dm

Adds a new luxury bar capsule to the miners vending machines which cost ten thousand mining points (#45547)

2019-08-08 01:07:20 -07:00