Merge branch 'master' into fruit

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -114276,11 +114276,6 @@
 /obj/structure/cable/white{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/maintenance_hatch{
-	name = "Maintenance Hatch";
-	req_access_txt = "12"
-	},
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
@@ -114288,6 +114283,10 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/machinery/door/airlock/maintenance_hatch{
+	name = "Chapel Maintenance";
+	req_access_txt = "27"
+	},
 /turf/open/floor/plasteel,
 /area/maintenance/port/aft)
 "dKE" = (
@@ -118987,7 +118986,6 @@
 /obj/structure/cable/white{
 	icon_state = "1-2"
 	},
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel,
@@ -119332,7 +119330,6 @@
 /turf/closed/wall,
 /area/chapel/office)
 "dTx" = (
-/obj/structure/bodycontainer/morgue,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -119343,6 +119340,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/structure/closet/crate/coffin,
 /turf/open/floor/plasteel/dark,
 /area/chapel/office)
 "dTy" = (
@@ -121768,7 +121766,6 @@
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "dYv" = (
-/obj/structure/bodycontainer/morgue,
 /obj/structure/sign/poster/official/ian{
 	pixel_y = -32
 	},
@@ -121782,6 +121779,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/structure/closet/crate/coffin,
 /turf/open/floor/plasteel/dark,
 /area/chapel/office)
 "dYw" = (
@@ -126476,6 +126474,7 @@
 	name = "Mass Driver"
 	},
 /obj/machinery/mass_driver{
+	id = "chapelgun";
 	name = "Holy Driver"
 	},
 /turf/open/floor/plating,
@@ -126706,7 +126705,7 @@
 /area/science/mixing)
 "iyd" = (
 /turf/open/space,
-/area/space/nearstation)
+/area/space)
 "iQh" = (
 /obj/structure/bodycontainer/morgue{
 	dir = 1
@@ -126946,19 +126945,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/maintenance/port)
-"kzR" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/machinery/door/airlock/maintenance_hatch{
-	name = "Chapel Maintenance";
-	req_access_txt = "27"
-	},
-/turf/open/floor/plasteel,
-/area/chapel/office)
 "kLu" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -160100,7 +160086,7 @@ dYu
 dZg
 jhK
 jhK
-kzR
+dZN
 owr
 mXJ
 gJj

code/__HELPERS/unsorted.dm

@@ -1487,6 +1487,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
 		/obj/item/reagent_containers/food/snacks/grown/nettle, // base type
 		/obj/item/reagent_containers/food/snacks/deepfryholder,
 		/obj/item/reagent_containers/food/snacks/grown/shell,
+		/obj/item/reagent_containers/food/snacks/clothing,
 		/obj/item/reagent_containers/food/snacks/store/bread
 		)
 	blocked |= typesof(/obj/item/reagent_containers/food/snacks/customizable)

code/modules/clothing/under/miscellaneous.dm

@@ -703,14 +703,6 @@
 	fitted = NO_FEMALE_UNIFORM
 	can_adjust = FALSE
 	resistance_flags = NONE
-/obj/item/clothing/under/durathread
-	name = "durathread jumpsuit"
-	desc = "A jumpsuit made from durathread, its resilient fibres provide some protection to the wearer."
-	icon_state = "durathread"
-	item_state = "durathread"
-	item_color = "durathread"
-	can_adjust = FALSE
-	armor = list("melee" = 10, "laser" = 10, "fire" = 40, "acid" = 10, "bomb" = 5)
 
 /obj/item/clothing/under/gear_harness
 	name = "gear harness"
@@ -725,5 +717,15 @@
 	icon_state = "durathread"
 	item_state = "durathread"
 	item_color = "durathread"
+	can_adjust = TRUE
+	armor = list("melee" = 10, "laser" = 10, "fire" = 40, "acid" = 10, "bomb" = 5)
+
+/obj/item/clothing/under/duraskirt
+	name = "durathread jumpskirt"
+	desc = "A jumpsuit made from durathread, its resilient fibres provide some protection to the wearer. Being a short skirt, it naturally doesn't protect the legs."
+	icon_state = "duraskirt"
+	item_state = "duraskirt"
+	item_color = "durathread"
 	can_adjust = FALSE
+	body_parts_covered = CHEST|GROIN|ARMS
 	armor = list("melee" = 10, "laser" = 10, "fire" = 40, "acid" = 10, "bomb" = 5)

code/modules/mob/living/simple_animal/slime/life.dm

@@ -69,7 +69,7 @@
 
 						if(Target.Adjacent(src))
 							Target.attack_slime(src)
-					return
+					break
 				if(!Target.lying && prob(80))
 
 					if(Target.client && Target.health >= 20)

code/modules/mob/mob.dm

@@ -457,13 +457,17 @@
 	set name = ".click"
 	set hidden = TRUE
 	set category = null
-	return
+	var/msg = "[key_name_admin(src)]([ADMIN_KICK(src)]) attempted to use the .click macro!"
+	log_admin(msg)
+	message_admins(msg)
 
 /mob/verb/DisDblClick(argu = null as anything, sec = "" as text, number1 = 0 as num  , number2 = 0 as num)
 	set name = ".dblclick"
 	set hidden = TRUE
 	set category = null
-	return
+	var/msg = "[key_name_admin(src)]([ADMIN_KICK(src)]) attempted to use the .dblclick macro!"
+	log_admin(msg)
+	message_admins(msg)
 
 /mob/Topic(href, href_list)
 	if(href_list["mach_close"])

html/changelogs/AutoChangeLog-pr-9175.yml

@@ -0,0 +1,5 @@
+author: "lolman360"
+delete-after: True
+changes: 
+  - rscadd: "Added durathread jumpskirt"
+  - imageadd: "Duraskirt sprites and rolled down jumpsuit sprites."

html/changelogs/AutoChangeLog-pr-9210.yml

@@ -0,0 +1,7 @@
+author: "EmeraldSundisk"
+delete-after: True
+changes: 
+  - tweak: "CentCom has noticed the lack of coffins in Delta Station's chapel and provided some, but in exchange for reducing the chapel morgue's capacity."
+  - tweak: "Fixed a maintenance door the chaplain should have been able to open."
+  - bugfix: "Fixes space areas outside the driver
+removal: CentCom Defense Analysts have ordered the maintenance hatch to the Mass Driver room be removed citing \"security concerns\"."

html/changelogs/AutoChangeLog-pr-9216.yml

@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes: 
+  - bugfix: "oops not being blacklisted"

html/changelogs/AutoChangeLog-pr-9219.yml

@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes: 
+  - bugfix: "ports a fix"