Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch

code/game/objects/items/devices/chameleonproj.dm

@@ -144,8 +144,8 @@
 /obj/effect/dummy/chameleon/attack_alien()
 	master.disrupt()
 
-/obj/effect/dummy/chameleon/ex_act(S, T)
-	contents_explosion(S, T)
+/obj/effect/dummy/chameleon/ex_act(severity, target, origin)
+	contents_explosion(severity, target, origin)
 	master.disrupt()
 
 /obj/effect/dummy/chameleon/bullet_act()

code/game/objects/items/devices/doorCharge.dm

@@ -14,7 +14,7 @@
 	attack_verb = list("blown up", "exploded", "detonated")
 	custom_materials = list(/datum/material/iron=50, /datum/material/glass=30)
 
-/obj/item/doorCharge/ex_act(severity, target)
+/obj/item/doorCharge/ex_act(severity, target, origin)
 	switch(severity)
 		if(EXPLODE_DEVASTATE)
 			visible_message("<span class='warning'>[src] detonates!</span>")

code/game/objects/items/devices/portable_chem_mixer.dm

@@ -27,7 +27,7 @@
 	QDEL_NULL(beaker)
 	return ..()
 
-/obj/item/storage/portable_chem_mixer/ex_act(severity, target)
+/obj/item/storage/portable_chem_mixer/ex_act(severity, target, origin)
 	if(severity < 3)
 		..()