Merge branch 'master' into upstream-merge-27534

code/modules/awaymissions/bluespaceartillery.dm

@@ -53,7 +53,7 @@
 		for(var/turf/T in get_area_turfs(thearea.type))
 			L+=T
 		var/loc = pick(L)
-		explosion(loc,explosiondev,explosionmed,explosionlight)
+		explosion(loc,explosiondev,explosionmed,explosionlight)
 		reload = 0
 
 /*/mob/proc/openfire()

code/modules/awaymissions/corpse.dm

@@ -319,12 +319,18 @@
 	icon_state = "sleeper"
 	flavour_text = "You are a beach bum!"
 
+
 /datum/outfit/beachbum
 	name = "Beach Bum"
 	glasses = /obj/item/clothing/glasses/sunglasses
 	uniform = /obj/item/clothing/under/shorts/red
 	r_pocket = /obj/item/weapon/storage/wallet/random
 
+/datum/outfit/beachbum/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+	..()
+	if(visualsOnly)
+		return
+	H.dna.add_mutation(STONER)
 
 /////////////////Officers+Nanotrasen Security//////////////////////
 

code/modules/awaymissions/mission_code/stationCollision.dm

@@ -46,8 +46,8 @@
 //Syndicate sub-machine guns.
 /obj/item/weapon/gun/ballistic/automatic/c20r/sc_c20r
 
-/obj/item/weapon/gun/ballistic/automatic/c20r/sc_c20r/New()
-	..()
+/obj/item/weapon/gun/ballistic/automatic/c20r/sc_c20r/Initialize()
+	. = ..()
 	for(var/ammo in magazine.stored_ammo)
 		if(prob(95)) //95% chance
 			magazine.stored_ammo -= ammo
@@ -55,8 +55,8 @@
 //Barman's shotgun
 /obj/item/weapon/gun/ballistic/shotgun/sc_pump
 
-/obj/item/weapon/gun/ballistic/shotgun/sc_pump/New()
-	..()
+/obj/item/weapon/gun/ballistic/shotgun/sc_pump/Initialize()
+	. = ..()
 	for(var/ammo in magazine.stored_ammo)
 		if(prob(95)) //95% chance
 			magazine.stored_ammo -= ammo

code/modules/awaymissions/mission_code/wildwest.dm

@@ -107,7 +107,7 @@
 		var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
 		s.set_up(3, 1, src)
 		s.start()
-		explosion(M, 1, 0, 0, 0)
+		explosion(M, 1, 0, 0, 0)
 		qdel(src)
 
 /////For the Wishgranter///////////