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

code/modules/events/holiday/xmas.dm

@@ -37,7 +37,7 @@
 	icon_state = "xmashat"
 	desc = "A crappy paper hat that you are REQUIRED to wear."
 	flags_inv = 0
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0)
 
 /obj/effect/landmark/xmastree
 	name = "christmas tree spawner"

code/modules/events/pirates.dm

@@ -275,7 +275,7 @@
 	var/sending_timer
 	var/cargo_hold_id
 
-/obj/machinery/computer/piratepad_control/Initialize()
+/obj/machinery/computer/piratepad_control/Initialize(mapload)
 	..()
 	return INITIALIZE_HINT_LATELOAD
 

code/modules/events/shuttle_loan.dm

@@ -271,7 +271,7 @@
 	name = "Objectives of a Bee Liberation Front Operative"
 	info = "<b>Objective #1</b>. Liberate all bees on the NT transport vessel 2416/B. <b>Success!</b>  <br><b>Objective #2</b>. Escape alive. <b>Failed.</b>"
 
-/obj/machinery/syndicatebomb/shuttle_loan/Initialize()
+/obj/machinery/syndicatebomb/shuttle_loan/Initialize(mapload)
 	. = ..()
 	setAnchored(TRUE)
 	timer_set = rand(480, 600) //once the supply shuttle docks (after 5 minutes travel time), players have between 3-5 minutes to defuse the bomb

code/modules/events/spacevine.dm

@@ -276,7 +276,7 @@
 	var/datum/spacevine_controller/master = null
 	var/list/mutations = list()
 
-/obj/structure/spacevine/Initialize()
+/obj/structure/spacevine/Initialize(mapload)
 	. = ..()
 	add_atom_colour("#ffffff", FIXED_COLOUR_PRIORITY)
 
@@ -327,7 +327,7 @@
 	user.DelayNextAction()
 	for(var/datum/spacevine_mutation/SM in mutations)
 		damage_dealt = SM.on_hit(src, user, I, damage_dealt) //on_hit now takes override damage as arg and returns new value for other mutations to permutate further
-	take_damage(damage_dealt, I.damtype, "melee", 1)
+	take_damage(damage_dealt, I.damtype, MELEE, 1)
 
 /obj/structure/spacevine/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
 	switch(damage_type)
@@ -523,7 +523,7 @@
 	if(!override)
 		qdel(src)
 
-/obj/structure/spacevine/CanPass(atom/movable/mover, turf/target)
+/obj/structure/spacevine/CanAllowThrough(atom/movable/mover, turf/target)
 	. = ..()
 	if(isvineimmune(mover))
 		return TRUE

code/modules/events/travelling_trader.dm

@@ -98,7 +98,7 @@
 	var/reward = pickweight(possible_rewards)
 	new reward(get_turf(src))
 
-/mob/living/carbon/human/dummy/travelling_trader/Initialize()
+/mob/living/carbon/human/dummy/travelling_trader/Initialize(mapload)
 	. = ..() // return a hint you fuck
 	add_atom_colour("#570d6b", FIXED_COLOUR_PRIORITY) //make them purple (otherworldly!)
 	set_light(1, -0.7, "#AAD84B")
@@ -134,7 +134,7 @@
 		/obj/item/kitchen/fork/throwing = 1,
 		/mob/living/simple_animal/cow/random = 1)
 
-/mob/living/carbon/human/dummy/travelling_trader/cook/Initialize()
+/mob/living/carbon/human/dummy/travelling_trader/cook/Initialize(mapload)
 	//pick a random crafted food item as the requested item
 	var/datum/crafting_recipe/food_recipe = pick(subtypesof(/datum/crafting_recipe/food))
 	var/result = initial(food_recipe.result)
@@ -158,7 +158,7 @@
 		/obj/item/seeds/gatfruit = 1) //overall you have less chance of seeing them than a lifebringer just bringing the seeds to you directly
 
 
-/mob/living/carbon/human/dummy/travelling_trader/gardener/Initialize()
+/mob/living/carbon/human/dummy/travelling_trader/gardener/Initialize(mapload)
 	requested_item = pick(subtypesof(/obj/item/reagent_containers/food/snacks/grown) - list(/obj/item/reagent_containers/food/snacks/grown/shell,
 		/obj/item/reagent_containers/food/snacks/grown/shell/gatfruit,
 		/obj/item/reagent_containers/food/snacks/grown/cherry_bomb))
@@ -188,7 +188,7 @@
 		/mob/living/simple_animal/hostile/netherworld/blankbody = 1,
 		/mob/living/simple_animal/hostile/retaliate/goose = 1)
 
-/mob/living/carbon/human/dummy/travelling_trader/animal_hunter/Initialize()
+/mob/living/carbon/human/dummy/travelling_trader/animal_hunter/Initialize(mapload)
 	. = ..()
 	acceptance_speech = pick(list("This lifeform shall make for a great stew, thank you.", "This lifeform shall be of a true use to our cause, thank you.", "The lifeform is adequate. Goodbye.", "This lifeform shall make a great addition to my collection."))
 
@@ -222,7 +222,7 @@
 		/obj/structure/reagent_dispensers/keg/narsour = 3,
 		/obj/structure/reagent_dispensers/keg/quintuple_sec = 3)
 
-/mob/living/carbon/human/dummy/travelling_trader/bartender/Initialize() //pick a subtype of ethanol that isn't found in the default set of the booze dispensers reagents
+/mob/living/carbon/human/dummy/travelling_trader/bartender/Initialize(mapload) //pick a subtype of ethanol that isn't found in the default set of the booze dispensers reagents
 	. = ..() // RETURN A HINT.
 	requested_item = pick(subtypesof(/datum/reagent/consumable/ethanol) - list(/datum/reagent/consumable/ethanol/beer,
 		/datum/reagent/consumable/ethanol/kahlua,
@@ -276,7 +276,7 @@
 		/obj/item/stack/sticky_tape/infinite = 2,
 		/obj/item/clothing/suit/hooded/wintercoat/cosmic = 2)
 
-/mob/living/carbon/human/dummy/travelling_trader/artifact_dealer/Initialize()
+/mob/living/carbon/human/dummy/travelling_trader/artifact_dealer/Initialize(mapload)
 	possible_rewards += list(pick(subtypesof(/obj/item/clothing/head/collectable)) = 1) //this is slightly lower because it's absolutely useless
 	..()
 

code/modules/events/wizard/magicarp.dm

@@ -41,7 +41,7 @@
 	/obj/item/projectile/magic/death, /obj/item/projectile/magic/teleport, /obj/item/projectile/magic/door, /obj/item/projectile/magic/aoe/fireball,
 	/obj/item/projectile/magic/spellblade, /obj/item/projectile/magic/arcane_barrage)
 
-/mob/living/simple_animal/hostile/carp/ranged/Initialize()
+/mob/living/simple_animal/hostile/carp/ranged/Initialize(mapload)
 	projectiletype = pick(allowed_projectile_types)
 	. = ..()