Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792

2020-05-31 16:08:52 +02:00
parent 949e8f6b3a b7411bf9a0
commit 2f3fd48b84
363 changed files with 10012 additions and 3157 deletions
@@ -748,3 +748,10 @@ GLOBAL_LIST_EMPTY(asset_datums)
 /datum/asset/spritesheet/simple/skills
 	name = "skills"

+/datum/asset/spritesheet/simple/skills/register()
+	InsertAll("", 'icons/UI_icons/skills.dmi')
+
+/datum/asset/simple/vv
+	assets = list(
+		"view_variables.css" = 'html/admin/view_variables.css'
+	)