From 133bc96344ad9b4ff476090df216a257530390cb Mon Sep 17 00:00:00 2001 From: mwerezak Date: Fri, 14 Aug 2015 23:20:10 -0400 Subject: [PATCH] Fixes #10645 Sets unacidable where appropriate. --- code/game/objects/items/weapons/paint.dm | 1 + code/modules/detectivework/footprints_and_rag.dm | 1 + code/modules/reagents/dispenser/cartridge.dm | 1 + .../modules/reagents/reagent_containers/food/drinks/bottle.dm | 4 ++++ .../reagents/reagent_containers/food/drinks/drinkingglass.dm | 1 + code/modules/reagents/reagent_containers/food/drinks/jar.dm | 1 + code/modules/reagents/reagent_containers/glass.dm | 2 ++ code/modules/reagents/reagent_containers/hypospray.dm | 1 + code/modules/reagents/reagent_containers/spray.dm | 1 + code/modules/reagents/reagent_containers/syringes.dm | 1 + 10 files changed, 14 insertions(+) diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index d92812b3fde..fe1247cc899 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -14,6 +14,7 @@ var/global/list/cached_icons = list() amount_per_transfer_from_this = 10 possible_transfer_amounts = list(10,20,30,60) volume = 60 + unacidable = 0 flags = OPENCONTAINER var/paint_type = "red" diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm index aedf6e4c9f6..38cac18fbb0 100644 --- a/code/modules/detectivework/footprints_and_rag.dm +++ b/code/modules/detectivework/footprints_and_rag.dm @@ -24,6 +24,7 @@ volume = 5 can_be_placed_into = null flags = OPENCONTAINER | NOBLUDGEON + unacidable = 0 /obj/item/weapon/reagent_containers/glass/rag/attack_self(mob/user as mob) return diff --git a/code/modules/reagents/dispenser/cartridge.dm b/code/modules/reagents/dispenser/cartridge.dm index 569da4cc731..2f7369cba0d 100644 --- a/code/modules/reagents/dispenser/cartridge.dm +++ b/code/modules/reagents/dispenser/cartridge.dm @@ -9,6 +9,7 @@ amount_per_transfer_from_this = 50 // Large, but inaccurate. Use a chem dispenser or beaker for accuracy. possible_transfer_amounts = list(50, 100) + unacidable = 1 var/spawn_reagent = null var/label = "" diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index 7e289a45f35..8db599bf524 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -9,6 +9,10 @@ var/const/duration = 13 //Directly relates to the 'weaken' duration. Lowered by armor (i.e. helmets) var/isGlass = 1 //Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it +/obj/item/weapon/reagent_containers/food/drinks/bottle/New() + ..() + if(isGlass) unacidable = 1 + /obj/item/weapon/reagent_containers/food/drinks/bottle/proc/smash(mob/living/target as mob, mob/living/user as mob) //Creates a shattering noise and replaces the bottle with a broken_bottle diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm index 0dc30124935..c7f0f0a9fee 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm @@ -6,6 +6,7 @@ icon_state = "glass_empty" amount_per_transfer_from_this = 5 volume = 30 + unacidable = 1 //glass center_of_mass = list("x"=16, "y"=10) on_reagent_change() diff --git a/code/modules/reagents/reagent_containers/food/drinks/jar.dm b/code/modules/reagents/reagent_containers/food/drinks/jar.dm index 7cca924261b..47abb8637a3 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/jar.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/jar.dm @@ -8,6 +8,7 @@ icon_state = "jar" item_state = "beaker" center_of_mass = list("x"=15, "y"=8) + unacidable = 1 New() ..() reagents.add_reagent("slime", 50) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 123bbc9d1fa..359e6b2c99e 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -14,6 +14,7 @@ volume = 60 w_class = 2 flags = OPENCONTAINER + unacidable = 1 //glass doesn't dissolve in acid var/label_text = "" @@ -219,6 +220,7 @@ possible_transfer_amounts = list(10,20,30,60,120) volume = 120 flags = OPENCONTAINER + unacidable = 0 attackby(var/obj/D, mob/user as mob) if(isprox(D)) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 6656eeecc0a..a2ae1ebaad8 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -9,6 +9,7 @@ item_state = "hypo" icon_state = "hypo" amount_per_transfer_from_this = 5 + unacidable = 1 volume = 30 possible_transfer_amounts = null flags = OPENCONTAINER diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 0da6f7e0c4c..d9d5bc7ce81 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -11,6 +11,7 @@ throw_speed = 2 throw_range = 10 amount_per_transfer_from_this = 10 + unacidable = 1 //plastic possible_transfer_amounts = list(5,10) //Set to null instead of list, if there is only one. var/spray_size = 3 var/list/spray_sizes = list(1,3) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 0f3076fdb69..f186d6d87f4 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -18,6 +18,7 @@ w_class = 1 slot_flags = SLOT_EARS sharp = 1 + unacidable = 1 //glass var/mode = SYRINGE_DRAW var/image/filling //holds a reference to the current filling overlay var/visible_name = "a syringe"