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

2020-01-03 18:24:39 +01:00
parent 4d06d231f8 82db38d5d6
commit f5b251db66
112 changed files with 1137 additions and 616 deletions
@@ -1298,4 +1298,12 @@

 /mob/living/silicon/robot/adjustStaminaLossBuffered(amount, updating_health = 1)
 	if(istype(cell))
-		cell.charge -= amount*5
+		cell.charge -= amount*5
+
+/mob/living/silicon/robot/verb/viewmanifest()
+	set category = "Robot Commands"
+	set name = "View Crew Manifest"
+
+	if(usr.stat == DEAD)
+		return //won't work if dead
+	ai_roster()