From 35d7c673af5a9f4c445460499c2d4b4642b8df32 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Fri, 28 Apr 2017 18:23:21 -0500 Subject: [PATCH 1/2] Makes it so things actually embed again. --- code/game/objects/items.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 4316da3c499..65ae83bb829 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -50,7 +50,7 @@ var/zoomdevicename = null //name used for message when binoculars/scope is used var/zoom = 0 //1 if item is actively being used to zoom. For scoped guns and binoculars. - var/embed_chance = -1 //-1 makes it calculate embed chance, 0 won't embed, and 100 will always embed + var/embed_chance = -1 //0 won't embed, and 100 will always embed var/icon_override = null //Used to override hardcoded clothing dmis in human clothing proc. @@ -79,12 +79,12 @@ var/list/sprite_sheets_obj = list() /obj/item/New() - if(embed_chance == -1) - if(sharp) - embed_chance = force/w_class - else - embed_chance = force/(w_class*3) ..() + if(embed_chance < 0) + if(sharp) + embed_chance = round(force/w_class) + else + embed_chance = round(force/(w_class*3)) /obj/item/equipped() ..() From 3173baaec154058f5bbdd4792fd91815b701c79f Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sat, 29 Apr 2017 10:03:43 -0500 Subject: [PATCH 2/2] Adds a minimum 5% chance to embed --- code/game/objects/items.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 65ae83bb829..de91b79d60c 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -82,9 +82,9 @@ ..() if(embed_chance < 0) if(sharp) - embed_chance = round(force/w_class) + embed_chance = max(5, round(force/w_class)) else - embed_chance = round(force/(w_class*3)) + embed_chance = max(5, round(force/(w_class*3))) /obj/item/equipped() ..()