Merge branch 'master' into movespeed_modifiers_take_two

code/game/objects/effects/alien_acid.dm

@@ -53,6 +53,7 @@
 		return 0
 
 /obj/effect/acid/Crossed(AM as mob|obj)
+	. = ..()
 	if(isliving(AM))
 		var/mob/living/L = AM
 		if(L.movement_type & FLYING)

code/game/objects/effects/anomalies.dm

@@ -107,6 +107,7 @@
 				O.throw_at(target, 5, 10)
 
 /obj/effect/anomaly/grav/Crossed(atom/movable/AM)
+	. = ..()
 	gravShock(AM)
 
 /obj/effect/anomaly/grav/Bump(atom/A)
@@ -154,6 +155,7 @@
 		mobShock(M)
 
 /obj/effect/anomaly/flux/Crossed(atom/movable/AM)
+	. = ..()
 	mobShock(AM)
 
 /obj/effect/anomaly/flux/Bump(atom/A)

code/game/objects/effects/decals/crayon.dm

@@ -1,3 +1,5 @@
+GLOBAL_LIST(gang_tags)
+
 /obj/effect/decal/cleanable/crayon
 	name = "rune"
 	desc = "Graffiti. Damn kids."
@@ -28,6 +30,20 @@
 	if(main)
 		paint_colour = main
 	add_atom_colour(paint_colour, FIXED_COLOUR_PRIORITY)
-
 /obj/effect/decal/cleanable/crayon/NeverShouldHaveComeHere(turf/T)
 	return isgroundlessturf(T)
+
+/obj/effect/decal/cleanable/crayon/gang
+	name = "Leet Like Jeff K gang tag"
+	desc = "Looks like someone's claimed this area for Leet Like Jeff K."
+	icon = 'icons/obj/gang/tags.dmi'
+	layer = BELOW_MOB_LAYER
+	var/datum/team/gang/my_gang
+
+/obj/effect/decal/cleanable/crayon/gang/Initialize(mapload, main, type, e_name, graf_rot, alt_icon = null)
+	. = ..()
+	LAZYADD(GLOB.gang_tags, src)
+
+/obj/effect/decal/cleanable/crayon/gang/Destroy()
+	LAZYREMOVE(GLOB.gang_tags, src)
+	..()

code/game/objects/effects/effects.dm

@@ -6,6 +6,7 @@
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF
 	move_resist = INFINITY
 	obj_flags = 0
+	vis_flags = NONE
 
 /obj/effect/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
 	return

code/game/objects/effects/mines.dm

@@ -11,6 +11,7 @@
 	to_chat(victim, "<span class='danger'>*click*</span>")
 
 /obj/effect/mine/Crossed(AM as mob|obj)
+	. = ..()
 	if(isturf(loc))
 		if(ismob(AM))
 			var/mob/MM = AM
@@ -132,14 +133,13 @@
 
 	INVOKE_ASYNC(src, .proc/blood_delusion, victim)
 
-	var/obj/item/twohanded/required/chainsaw/doomslayer/chainsaw = new(victim.loc)
+	var/obj/item/chainsaw/doomslayer/chainsaw = new(victim.loc)
 	victim.log_message("entered a blood frenzy", LOG_ATTACK)
 
 	ADD_TRAIT(chainsaw, TRAIT_NODROP, CHAINSAW_FRENZY_TRAIT)
 	victim.drop_all_held_items()
 	victim.put_in_hands(chainsaw, forced = TRUE)
 	chainsaw.attack_self(victim)
-	chainsaw.wield(victim)
 	victim.reagents.add_reagent(/datum/reagent/medicine/adminordrazine,25)
 	to_chat(victim, "<span class='warning'>KILL, KILL, KILL! YOU HAVE NO ALLIES ANYMORE, KILL THEM ALL!</span>")
 

code/game/objects/effects/overlays.dm

@@ -49,5 +49,6 @@
 /obj/effect/overlay/vis
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	anchored = TRUE
+	vis_flags = NONE
 	var/unused = 0 //When detected to be unused it gets set to world.time, after a while it gets removed
 	var/cache_expiration = 2 MINUTES // overlays which go unused for 2 minutes get cleaned up

code/game/objects/effects/portals.dm

@@ -229,7 +229,6 @@
 			var/obj/projectile/P = M
 			P.ignore_source_check = TRUE
 		return TRUE
-	return FALSE
 	// try to search for a new one if something was var edited etc
 	set_linked()
 	. = ..()

code/game/objects/effects/proximity.dm

@@ -112,4 +112,5 @@
 
 /obj/effect/abstract/proximity_checker/Crossed(atom/movable/AM)
 	set waitfor = FALSE
+	. = ..()
 	monitor.hasprox_receiver.HasProximity(AM)

code/game/objects/effects/spawners/lootdrop.dm

@@ -67,7 +67,8 @@
 				/obj/item/gun/ballistic/shotgun/automatic/combat = 5,
 				/obj/item/bikehorn/golden,
 				/obj/item/grenade/clusterbuster,
-				/obj/item/storage/box/syndie_kit/throwing_weapons = 3)
+				/obj/item/storage/box/syndie_kit/throwing_weapons = 3,
+				/obj/item/gun/ballistic/revolver/mateba)
 
 /obj/effect/spawner/lootdrop/gambling
 	name = "gambling valuables spawner"
@@ -169,7 +170,7 @@
 				)
 
 /obj/effect/spawner/lootdrop/organ_spawner
-	name = "organ spawner"
+	name = "ayylien organ spawner"
 	loot = list(
 		/obj/item/organ/heart/gland/electric = 3,
 		/obj/item/organ/heart/gland/trauma = 4,
@@ -185,6 +186,28 @@
 		/obj/item/organ/regenerative_core = 2)
 	lootcount = 3
 
+/obj/effect/spawner/lootdrop/memeorgans
+	name = "meme organ spawner"
+	loot = list(
+		/obj/item/organ/ears/penguin,
+		/obj/item/organ/ears/cat,
+		/obj/item/organ/eyes/moth,
+		/obj/item/organ/eyes/snail,
+		/obj/item/organ/tongue/bone,
+		/obj/item/organ/tongue/fly,
+		/obj/item/organ/tongue/snail,
+		/obj/item/organ/tongue/lizard,
+		/obj/item/organ/tongue/alien,
+		/obj/item/organ/tongue/ethereal,
+		/obj/item/organ/tongue/robot,
+		/obj/item/organ/tongue/zombie,
+		/obj/item/organ/appendix,
+		/obj/item/organ/liver/fly,
+		/obj/item/organ/lungs/plasmaman,
+		/obj/item/organ/tail/cat,
+		/obj/item/organ/tail/lizard)
+	lootcount = 5
+
 /obj/effect/spawner/lootdrop/two_percent_xeno_egg_spawner
 	name = "2% chance xeno egg spawner"
 	loot = list(

code/game/objects/effects/temporary_visuals/miscellaneous.dm

@@ -461,6 +461,7 @@
 	icon_state = ""
 	layer = ABOVE_ALL_MOB_LAYER
 	anchored = TRUE
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	var/status = 0
 	var/delay = 0