Merge remote-tracking branch 'upstream/master' into kk-misc3

code/modules/mob/language/station.dm

@@ -204,7 +204,7 @@
 		)
 
 /datum/language/seromi/get_random_name(gender)
-	return ..(gender, 1, 4, 1.5)
+	return ..(gender, 2, 4, 1.5)
 
 
 /datum/language/zaddat

code/modules/mob/mob.dm

@@ -229,7 +229,8 @@
 	var/turf/our_tile = get_turf(src)
 	var/obj/visual = new /obj/effect/decal/point(our_tile)
 	visual.invisibility = invisibility
-	visual.plane = plane
+	visual.plane = ABOVE_PLANE
+	visual.layer = FLY_LAYER
 
 	animate(visual,
 		pixel_x = (tile.x - our_tile.x) * world.icon_size + A.pixel_x,
@@ -237,9 +238,7 @@
 		time = 1.7,
 		easing = EASE_OUT)
 
-	spawn(20)
-		if(visual)
-			qdel(visual)	// qdel
+	QDEL_IN(visual, 2 SECONDS) //Better qdel
 
 	face_atom(A)
 	return 1

code/modules/projectiles/guns/energy/laser.dm

@@ -29,9 +29,16 @@
 	one_handed_penalty = 0 // Not sure if two-handing gets checked for mounted weapons, but better safe than sorry.
 
 /obj/item/weapon/gun/energy/laser/mounted/augment
+	name = "arm-laser"
+	desc = "A cruel malformation of a Hephaestus Industries G40E rifle, designed to kill with concentrated energy blasts, all while being stowable in the arm. This variant has the ability to \
+	switch between standard fire and a more efficent but weaker 'suppressive' fire."
 	use_external_power = FALSE
 	use_organic_power = TRUE
+	wielded_item_state = null
+	item_state = "augment_laser"
 	canremove = FALSE
+	one_handed_penalty = 5
+	battery_lock = 1
 
 /obj/item/weapon/gun/energy/laser/practice
 	name = "practice laser carbine"

code/modules/ventcrawl/ventcrawl.dm

@@ -64,8 +64,8 @@ var/list/ventcrawl_machinery = list(
 			listed = TRUE
 			break
 
-	//Only allow it if it's "IN" the mob, not equipped on/being held
-	if(listed && !get_inventory_slot(carried_item))
+	//Only allow it if it's "IN" the mob, not equipped on/being held. //Disabled, as it's very annoying that, for example, Pun Pun has no way to ventcrawl with his suit if given the verb, since the list of allowed items is ignored for worn items.
+	if(listed/* && !get_inventory_slot(carried_item)*/)
 		return 1
 
 /mob/living/carbon/is_allowed_vent_crawl_item(var/obj/item/carried_item)

tools/mapmerge2/requirements.txt

@@ -1,3 +1,3 @@
 pygit2
 bidict==0.13.1
-Pillow==6.2.0
+Pillow==7.1.0