merge fixes

2020-01-19 16:36:04 +08:00
parent 46da6604a4 0a5e2cf8ff
commit 25d7af31a5
1781 changed files with 224446 additions and 217542 deletions
@@ -141,6 +141,17 @@
 		current_button.add_overlay(mutable_appearance(icon_icon, button_icon_state))
 		current_button.button_icon_state = button_icon_state

+/datum/action/ghost
+	icon_icon = 'icons/mob/mob.dmi'
+	button_icon_state = "ghost"
+	name = "Ghostize"
+	desc = "Turn into a ghost and freely come back to your body."
+
+/datum/action/ghost/Trigger()
+	if(!..())
+		return 0
+	var/mob/M = target
+	M.ghostize(1)

 //Presets for item actions
 /datum/action/item_action