TG Sync 12/15/17

s

s

code/modules/mining/lavaland/ash_flora.dm

@@ -20,8 +20,8 @@
 	var/regrowth_time_low = 4800
 	var/regrowth_time_high = 8400
 
-/obj/structure/flora/ash/New()
-	..()
+/obj/structure/flora/ash/Initialize()
+	. = ..()
 	base_icon = "[icon_state][rand(1, 4)]"
 	icon_state = base_icon
 	if(prob(15))
@@ -153,8 +153,8 @@
 	max_integrity = 100
 	seed = /obj/item/seeds/lavaland/polypore
 
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/New()
-	..()
+/obj/item/reagent_containers/food/snacks/grown/ash_flora/Initialize()
+	. = ..()
 	pixel_x = rand(-4, 4)
 	pixel_y = rand(-4, 4)
 

code/modules/mining/lavaland/necropolis_chests.dm

@@ -107,6 +107,7 @@
 /datum/design/unique_modkit
 	category = list("Mining Designs", "Cyborg Upgrade Modules") //can't be normally obtained
 	build_type = PROTOLATHE | MECHFAB
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO
 
 /datum/design/unique_modkit/offensive_turf_aoe
 	name = "Kinetic Accelerator Offensive Mining Explosion Mod"
@@ -172,7 +173,7 @@
 				to_chat(M, "<span class='notice'>Your vision returns to normal.</span>")
 
 		wisp.stop_orbit()
-		wisp.loc = src
+		wisp.forceMove(src)
 		icon_state = "lantern-blue"
 		SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Returned")
 
@@ -412,7 +413,7 @@
 
 /obj/item/device/shared_storage/attackby(obj/item/W, mob/user, params)
 	if(bag)
-		bag.loc = user
+		bag.forceMove(user)
 		bag.attackby(W, user, params)
 
 
@@ -421,7 +422,7 @@
 		return
 	if(loc == user && user.back && user.back == src)
 		if(bag)
-			bag.loc = user
+			bag.forceMove(user)
 			bag.attack_hand(user)
 	else
 		..()

code/modules/mining/lavaland/ruins/gym.dm

@@ -29,7 +29,7 @@
 		icon_state = "fitnesslifter2"
 		user.setDir(SOUTH)
 		user.Stun(80)
-		user.loc = src.loc
+		user.forceMove(src.loc)
 		var/bragmessage = pick("pushing it to the limit","going into overdrive","burning with determination","rising up to the challenge", "getting strong now","getting ripped")
 		user.visible_message("<B>[user] is [bragmessage]!</B>")
 		var/lifts = 0
@@ -67,7 +67,7 @@
 		icon_state = "fitnessweight-c"
 		user.setDir(SOUTH)
 		user.Stun(80)
-		user.loc = src.loc
+		user.forceMove(src.loc)
 		var/mutable_appearance/swole_overlay = mutable_appearance(icon, "fitnessweight-w", WALL_OBJ_LAYER)
 		add_overlay(swole_overlay)
 		var/bragmessage = pick("pushing it to the limit","going into overdrive","burning with determination","rising up to the challenge", "getting strong now","getting ripped")
@@ -93,4 +93,4 @@
 		var/finishmessage = pick("You feel stronger!","You feel like you can take on the world!","You feel robust!","You feel indestructible!")
 		icon_state = "fitnessweight"
 		cut_overlay(swole_overlay)
-		to_chat(user, "[finishmessage]")
+		to_chat(user, "[finishmessage]")