Merge branch 'master' into TGUIs_Nexties

This commit is contained in:
Arturlang
2020-01-30 20:46:20 +02:00
committed by GitHub
418 changed files with 3862 additions and 4206 deletions

View File

@@ -465,7 +465,8 @@ GLOBAL_LIST_EMPTY(asset_datums)
"scanner" = 'icons/pda_icons/pda_scanner.png',
"signaler" = 'icons/pda_icons/pda_signaler.png',
"status" = 'icons/pda_icons/pda_status.png',
"dronephone" = 'icons/pda_icons/pda_dronephone.png'
"dronephone" = 'icons/pda_icons/pda_dronephone.png',
"emoji" = 'icons/pda_icons/pda_emoji.png'
)
/datum/asset/spritesheet/simple/paper