compile fixes + initial map port

modular_citadel/code/game/machinery/cryopod.dm

@@ -173,8 +173,8 @@
 	find_control_computer()
 	return ..()
 
-/obj/machinery/cryopod/proc/find_control_computer(urgent = 0)
-	for(var/obj/machinery/computer/cryopod/C in area_contents(get_area(src)))
+/obj/machinery/cryopod/proc/find_control_computer(urgent = 0,area/A)
+	for(var/obj/machinery/computer/cryopod/C in A)
 		control_computer = C
 		break
 
@@ -417,7 +417,7 @@
 
 	if(!Adjacent(user))
 		return
-		
+
 	if(target == user)
 		visible_message("[user] starts climbing into the cryo pod.")
 	else
@@ -426,7 +426,7 @@
 	if(occupant)
 		to_chat(user, "<span class='boldnotice'>\The [src] is in use.</span>")
 		return
-		
+
 	close_machine(target)
 
 	to_chat(target, "<span class='boldnotice'>If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.</span>")

modular_citadel/code/game/machinery/wishgranter.dm

@@ -38,7 +38,7 @@
 						to_chat(user, "[powah] materializes into your hands!")
 					else
 						to_chat(user, "[powah] materializes onto the floor.")
-					var/obj/machinery/power/supermatter_shard/powerwish = new /obj/machinery/power/supermatter_shard(loc)
+					var/obj/machinery/power/supermatter_crystal/powerwish = new /obj/machinery/power/supermatter_crystal(loc)
 					powerwish.damage = 700	//right at the emergency threshold
 					powerwish.produces_gas = FALSE
 					charges--

modular_citadel/code/game/objects/items/storage/firstaid.dm

@@ -39,9 +39,14 @@
 	throw_range = 7
 	var/empty = FALSE
 	item_state = "firstaid"
-	w_class = WEIGHT_CLASS_SMALL
-	max_combined_w_class = 5		//half that of regular kits
-	storage_slots = 5
+
+/obj/item/storage/hypospraykit/ComponentInitialize()
+	. = ..()
+	GET_COMPONENT(STR, /datum/component/storage)
+	STR.max_w_class = WEIGHT_CLASS_SMALL
+	STR.max_combined_w_class = 5
+	STR.max_items = 5
+	STR.cant_hold = typecacheof(list(/obj/item/disk/nuclear))
 
 /obj/item/storage/hypospraykit/regular
 	icon_state = "firstaid-mini"
@@ -107,7 +112,6 @@
 	name = "combat hypospray kit"
 	desc = "A hypospray kit best suited for combat situations."
 	icon_state = "tactical-mini"
-	max_w_class = WEIGHT_CLASS_NORMAL
 
 /obj/item/storage/hypospraykit/tactical/PopulateContents()
 	if(empty)
@@ -121,9 +125,14 @@
 	name = "deluxe hypospray kit"
 	desc = "A kit containing a Deluxe hypospray and Vials."
 	icon_state = "tactical-mini"
-	max_w_class = WEIGHT_CLASS_NORMAL
-	storage_slots = 6
-	max_combined_w_class = 6
+
+/obj/item/storage/hypospraykit/cmo/ComponentInitialize()
+	. = ..()
+	GET_COMPONENT(STR, /datum/component/storage)
+	STR.max_w_class = WEIGHT_CLASS_SMALL
+	STR.max_combined_w_class = 6
+	STR.max_items = 6
+	STR.cant_hold = typecacheof(list(/obj/item/disk/nuclear))
 
 /obj/item/storage/hypospraykit/cmo/PopulateContents()
 	if(empty)