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

code/modules/events/holiday/xmas.dm

@@ -79,17 +79,5 @@
 		santa = new /mob/living/carbon/human(pick(GLOB.blobstart))
 		C.transfer_ckey(santa, FALSE)
 
-		santa.equipOutfit(/datum/outfit/santa)
-		santa.update_icons()
-
-		var/datum/objective/santa_objective = new()
-		santa_objective.explanation_text = "Bring joy and presents to the station!"
-		santa_objective.completed = 1 //lets cut our santas some slack.
-		santa_objective.owner = santa.mind
-		santa.mind.objectives += santa_objective
-		santa.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/presents)
-		var/obj/effect/proc_holder/spell/targeted/area_teleport/teleport/telespell = new(santa)
-		telespell.clothes_req = 0 //santa robes aren't actually magical.
-		santa.mind.AddSpell(telespell) //does the station have chimneys? WHO KNOWS!
-
-		to_chat(santa, "<span class='boldannounce'>You are Santa! Your objective is to bring joy to the people on this station. You can conjure more presents using a spell, and there are several presents in your bag.</span>")
+		var/datum/antagonist/santa/A = new
+		santa.mind.add_antag_datum(A)

code/modules/events/spacevine.dm

@@ -251,7 +251,7 @@
 	holder.obj_integrity = holder.max_integrity
 
 /datum/spacevine_mutation/woodening/on_hit(obj/structure/spacevine/holder, mob/living/hitter, obj/item/I, expected_damage)
-	if(I.is_sharp())
+	if(I.get_sharpness())
 		. = expected_damage * 0.5
 	else
 		. = expected_damage
@@ -331,7 +331,7 @@
 
 /obj/structure/spacevine/attacked_by(obj/item/I, mob/living/user)
 	var/damage_dealt = I.force
-	if(I.is_sharp())
+	if(I.get_sharpness())
 		damage_dealt *= 4
 	if(I.damtype == BURN)
 		damage_dealt *= 4

code/modules/events/wizard/greentext.dm

@@ -40,7 +40,8 @@
 
 /obj/item/greentext/equipped(mob/living/user as mob)
 	to_chat(user, "<font color='green'>So long as you leave this place with greentext in hand you know will be happy...</font>")
-	if(user.mind && user.mind.objectives.len > 0)
+	var/list/other_objectives = user.mind.get_all_objectives()
+	if(user.mind && other_objectives.len > 0)
 		to_chat(user, "<span class='warning'>... so long as you still perform your other objectives that is!</span>")
 	new_holder = user
 	if(!last_holder)