Embed fixes

Author: Dimach

_maps/RandomZLevels/blackmesa.dmm

@@ -13324,10 +13324,10 @@
 "sLG" = (
 /obj/structure/closet/wardrobe,
 /obj/machinery/light/cold/directional/west,
-/obj/item/clothing/mask/cigarette/rollie/cannabis,
-/obj/item/clothing/mask/cigarette/rollie/cannabis,
-/obj/item/clothing/mask/cigarette/rollie/cannabis,
-/obj/item/clothing/mask/cigarette/rollie/cannabis,
+/obj/item/cigarette/rollie/cannabis,
+/obj/item/cigarette/rollie/cannabis,
+/obj/item/cigarette/rollie/cannabis,
+/obj/item/cigarette/rollie/cannabis,
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/floor/iron/dark/textured,
 /area/awaymission/black_mesa/hecu_zone_bathroom)
@@ -16071,8 +16071,7 @@
 /area/awaymission/black_mesa/black_ops_button)
 "xZR" = (
 /obj/structure/fluff/bus/passable{
-	icon_state = "bottomdoor";
-	layer = 3
+	icon_state = "bottomdoor"
 	},
 /turf/open/floor/iron/dark/textured_large,
 /area/awaymission/black_mesa/black_ops_bus)

modular_ss220/modules/return_prs/ammogun/modular_projectiles.dm

@@ -22,7 +22,7 @@
 	ricochet_decay_damage = 0.7
 	shrapnel_type = null
 	sharpness = NONE
-	embedding = null
+	embed_type = null
 	wound_bonus = -50
 
 /obj/item/ammo_casing/c45/hp
@@ -50,7 +50,7 @@
 	ricochet_decay_damage = 0.7
 	shrapnel_type = null
 	sharpness = NONE
-	embedding = null
+	embed_type = null
 	wound_bonus = -50
 
 /obj/item/ammo_casing/c46x30mm/rubber
@@ -84,7 +84,7 @@
 	ricochet_decay_damage = 0.7
 	shrapnel_type = null
 	sharpness = NONE
-	embedding = null
+	embed_type = null
 	wound_bonus = -50
 
 /obj/item/ammo_casing/a223/ap
@@ -130,7 +130,7 @@
 	wound_bonus = -75
 	shrapnel_type = null
 	sharpness = NONE
-	embedding = null
+	embed_type = null
 
 /obj/item/ammo_casing/c34/ap
 	name = ".34 armor-piercing bullet casing"

modular_ss220/modules/return_prs/ammogun/shotgunbullets.dm

@@ -47,7 +47,17 @@
 	name = "RIP shotgun slug"
 	damage = 50
 	weak_against_armour = TRUE
-	embedding = list(embed_chance=80, pain_chance=40, fall_chance=5, jostle_chance=5, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.5, pain_mult=5, rip_time=30)
+	embed_type = /datum/embed_data/shotgun_slug
+
+/datum/embed_data/shotgun_slug
+	embed_chance = 80
+	pain_chance=40
+	fall_chance=5
+	jostle_chance=5
+	ignore_throwspeed_threshold=TRUE
+	pain_stam_pct=0.5
+	pain_mult=5
+	rip_time=30
 
 /obj/item/ammo_casing/shotgun/iceblox
 	name = "Iceshot shell"

modular_ss220/modules/return_prs/black_mesa/code/armaments/armament_miscellaneous.dm

@@ -13,7 +13,7 @@
 	cost = 1
 
 /datum/armament_entry/hecu/misc/rollie
-	item_type = /obj/item/clothing/mask/cigarette/rollie/cannabis
+	item_type = /obj/item/cigarette/rollie/cannabis
 	max_purchase = 8
 	cost = 1
 

modular_ss220/modules/return_prs/black_mesa/code/m16_variations.dm

@@ -65,4 +65,4 @@
 	ricochet_decay_damage = 0.5
 	shrapnel_type = null
 	sharpness = NONE
-	embedding = null
+	embed_type = null

modular_ss220/modules/return_prs/gunsgalore/code/ammo/ammo.dm

@@ -168,7 +168,7 @@
 	ricochet_decay_damage = 0.7
 	shrapnel_type = null
 	sharpness = NONE
-	embedding = null
+	embed_type = null
 	wound_bonus = -50
 
 /obj/item/ammo_casing/realistic/a762x39/civilian/hunting
@@ -214,4 +214,4 @@
 	range = 0.01
 	shrapnel_type = null
 	sharpness = NONE
-	embedding = null
+	embed_type = null