Merge branch 'BeeStation:master' into slowclap

code/_globalvars/turf.dm

@@ -14,6 +14,7 @@ GLOBAL_LIST_INIT(turf_texture_hallway, list(/datum/turf_texture/hallway))
 GLOBAL_LIST_INIT(turf_texture_maint, list(/datum/turf_texture/maint, /datum/turf_texture/hallway, /datum/turf_texture/maint/tile))
 
 GLOBAL_LIST_INIT(turf_texture_iron, list(/datum/turf_texture/hallway, /datum/turf_texture/maint/tile))
+GLOBAL_LIST_INIT(turf_texture_iron_nonsegmented, list(/datum/turf_texture/hallway_nonsegmented))
 GLOBAL_LIST_INIT(turf_texture_plating, list(/datum/turf_texture/maint))
 
 /*

code/datums/components/crafting/crafting_lists/misc.dm

@@ -12,6 +12,26 @@
 	parts = list(/obj/item/camera = 1)
 	category = CAT_MISC
 
+/datum/crafting_recipe/barbell
+	name = "Barbell"
+	result = /obj/item/barbell
+	time = 2 SECONDS
+	reqs = list(
+		/obj/item/stack/sheet/iron = 4,
+		/obj/item/stack/rods = 2,
+	)
+	category = CAT_MISC
+
+/datum/crafting_recipe/chestpress
+	name = "Chest press handle"
+	result = /obj/item/barbell/stacklifting
+	time = 2 SECONDS
+	reqs = list(
+		/obj/item/stack/sheet/iron = 4,
+		/obj/item/stack/rods = 2,
+	)
+	category = CAT_MISC
+
 /datum/crafting_recipe/lizardhat
 	name = "Lizard Cloche Hat"
 	result = /obj/item/clothing/head/costume/lizard

code/datums/components/crafting/crafting_lists/structures.dm

@@ -120,3 +120,40 @@
 	category = CAT_STRUCTURE
 	one_per_turf = TRUE
 
+/datum/crafting_recipe/weightmachine
+	name = "Chest press machine"
+	result = /obj/structure/weightmachine
+	time = 6 SECONDS
+	reqs = list(
+		/obj/item/stack/sheet/iron = 2,
+		/obj/item/stack/rods = 6,
+		/obj/item/barbell/stacklifting = 1,
+	)
+	tools = list(TOOL_SCREWDRIVER, TOOL_WRENCH)
+	category = CAT_STRUCTURE
+	one_per_turf = TRUE
+
+/datum/crafting_recipe/weightmachine/weightlifter
+	name = "Inline bench press"
+	result = /obj/structure/weightmachine/weightlifter
+	time = 6 SECONDS
+	reqs = list(
+		/obj/item/stack/sheet/iron = 2,
+		/obj/item/stack/rods = 6,
+		/obj/item/barbell = 1,
+	)
+	tools = list(TOOL_SCREWDRIVER, TOOL_WRENCH)
+	category = CAT_STRUCTURE
+	one_per_turf = TRUE
+
+/datum/crafting_recipe/punching_bag
+	name = "Punching bag"
+	result = /obj/structure/punching_bag
+	time = 6 SECONDS
+	reqs = list(
+	/obj/item/stack/sheet/cotton/cloth = 10,
+	)
+	tools = list(TOOL_WIRECUTTER)
+	category = CAT_STRUCTURE
+	one_per_turf = TRUE
+

code/game/area/Space_Station_13_areas.dm

@@ -178,7 +178,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	color_correction = /datum/client_colour/area_color/cold_ish
 	camera_networks = list(CAMERA_NETWORK_STATION)
 
-/area/maintenance/get_turf_textures()
+/area/maintenance/get_area_textures()
 	return GLOB.turf_texture_maint
 
 //Maintenance - Departmental
@@ -242,7 +242,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Science Maintenance"
 	icon_state = "maint_sci"
 
-/area/maintenance/department/science/get_turf_textures()
+/area/maintenance/department/science/get_area_textures()
 	return GLOB.turf_texture_hallway
 
 /area/maintenance/department/science/central
@@ -420,7 +420,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	lighting_brightness_tube = 8
 	camera_networks = list(CAMERA_NETWORK_STATION)
 
-/area/hallway/get_turf_textures()
+/area/hallway/get_area_textures()
 	return GLOB.turf_texture_hallway
 
 /area/hallway/primary
@@ -642,7 +642,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	color_correction = /datum/client_colour/area_color/warm_ish
 	camera_networks = list(CAMERA_NETWORK_STATION)
 
-/area/crew_quarters/get_turf_textures()
+/area/crew_quarters/get_area_textures()
 	return GLOB.turf_texture_hallway
 
 /area/crew_quarters/dorms
@@ -892,7 +892,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Engineering"
 	icon_state = "engine"
 
-/area/engine/engineering/get_turf_textures()
+/area/engine/engineering/get_area_textures()
 	return GLOB.turf_texture_hallway
 
 /area/engineering/hallway
@@ -1216,7 +1216,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	color_correction = /datum/client_colour/area_color/warm_ish
 	camera_networks = list(CAMERA_NETWORK_STATION)
 
-/area/security/get_turf_textures()
+/area/security/get_area_textures()
 	return GLOB.turf_texture_hallway
 
 /area/security/main
@@ -1389,7 +1389,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	color_correction = /datum/client_colour/area_color/warm_yellow
 	camera_networks = list(CAMERA_NETWORK_STATION)
 
-/area/quartermaster/get_turf_textures()
+/area/quartermaster/get_area_textures()
 	return GLOB.turf_texture_hallway
 
 /area/quartermaster/sorting
@@ -1473,7 +1473,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	color_correction = /datum/client_colour/area_color/cold_ish
 	camera_networks = list(CAMERA_NETWORK_STATION)
 
-/area/hydroponics/get_turf_textures()
+/area/hydroponics/get_area_textures()
 	return GLOB.turf_texture_hallway
 
 /area/hydroponics/garden
@@ -1571,7 +1571,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Robotics"
 	icon_state = "robotics"
 
-/area/science/robotics/get_turf_textures()
+/area/science/robotics/get_area_textures()
 	return GLOB.turf_texture_hallway
 
 /area/science/robotics/mechbay
@@ -1615,7 +1615,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Primary Tool Storage"
 	icon_state = "primarystorage"
 
-/area/storage/primary/get_turf_textures()
+/area/storage/primary/get_area_textures()
 	return GLOB.turf_texture_hallway
 
 /area/storage/art

code/game/area/areas.dm

@@ -646,5 +646,5 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 	if(mood_job_reverse)
 		return !.  // the most eye bleeding syntax ive written
 
-/area/proc/get_turf_textures()
+/area/proc/get_area_textures()
 	return list()

code/game/objects/buckling.dm

@@ -68,7 +68,7 @@
   */
 /atom/movable/proc/mouse_buckle_handling(mob/living/M, mob/living/user)
 	if(can_buckle && istype(M) && istype(user))
-		return user_buckle_mob(M, user)
+		return user_buckle_mob(M, user, check_loc = FALSE)
 
 // Mobs have custom behaviour for buckling
 /mob/mouse_buckle_handling(mob/living/M, mob/living/user)
@@ -92,10 +92,14 @@
   * force - Set to TRUE to ignore src's can_buckle and M's can_buckle_to
   * check_loc - Set to FALSE to allow buckling from adjacent turfs, or TRUE if buckling is only allowed with src and M on the same turf.
   */
-/atom/movable/proc/buckle_mob(mob/living/M, force = FALSE, check_loc = TRUE)
+/atom/movable/proc/buckle_mob(mob/living/M, force = FALSE, check_loc = TRUE, needs_anchored = FALSE)
 	if(!buckled_mobs)
 		buckled_mobs = list()
 
+	if(!anchored && needs_anchored)
+		to_chat(M, "<span class='warning'>Secure [src] first!</span>")
+		return FALSE
+
 	if(!is_buckle_possible(M, force, check_loc))
 		return FALSE
 
@@ -131,7 +135,7 @@
 	SEND_SIGNAL(src, COMSIG_MOVABLE_BUCKLE, M, force)
 	return TRUE
 
-/obj/buckle_mob(mob/living/M, force = FALSE, check_loc = TRUE)
+/obj/buckle_mob(mob/living/M, force = FALSE, check_loc = TRUE, needs_anchored = FALSE)
 	. = ..()
 	if(.)
 		if(resistance_flags & ON_FIRE) //Sets the mob on fire if you buckle them to a burning atom/movableect

code/game/objects/structures/guillotine.dm

@@ -203,7 +203,7 @@
 			if (istype(S))
 				H.cut_overlays()
 				H.update_body_parts_head_only()
-				H.pixel_y += -GUILLOTINE_HEAD_OFFSET // Offset their body so it looks like they're in the guillotine
+				H.pixel_y -= GUILLOTINE_HEAD_OFFSET // Offset their body so it looks like they're in the guillotine
 				H.layer += GUILLOTINE_LAYER_DIFF
 			else
 				unbuckle_all_mobs()
@@ -212,12 +212,10 @@
 	else
 		unbuckle_all_mobs()
 
-	..()
-
 /obj/structure/guillotine/post_unbuckle_mob(mob/living/M)
 	M.regenerate_icons()
-	M.pixel_y -= -GUILLOTINE_HEAD_OFFSET // Move their body back
-	M.layer -= GUILLOTINE_LAYER_DIFF
+	M.pixel_y = M.base_pixel_y // Move their body back
+	M.layer = MOB_LAYER
 	..()
 
 /obj/structure/guillotine/can_be_unfasten_wrench(mob/user, silent)

code/game/objects/structures/gym/exercise_status.dm

@@ -19,7 +19,6 @@
 
 /datum/status_effect/exercised/on_creation(mob/living/new_owner, exercise_amount)
 	src.exercise_amount = exercise_amount * EXERCISE_INCREMENT
-	update_exercise()
 	return ..()
 
 /datum/status_effect/exercised/merge(exercise_amount)
@@ -49,6 +48,7 @@
 		var/delta = exercise_amount - applied_amount
 		var/mob/living/carbon/human/human_owner = owner
 		human_owner.physiology.stun_add -= delta
+		human_owner.physiology.stamina_mod -= delta
 		applied_amount = exercise_amount
 	switch (exercise_amount)
 		if (0.3 to 0.5)

code/game/objects/structures/gym/punching_bag.dm

@@ -24,3 +24,10 @@
 	SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "exercise", /datum/mood_event/exercise)
 	user.apply_status_effect(STATUS_EFFECT_EXERCISED, 1)
 
+/obj/structure/punching_bag/wirecutter_act(mob/living/user, obj/item/I)
+	to_chat(user, "<span class='notice'>You begin to cut [src] apart...</span>")
+	if(I.use_tool(src, user, 40, volume=50))
+		to_chat(user, "<span class='notice'>You cut [src] apart.</span>")
+		new /obj/item/stack/sheet/cotton/cloth(loc, 10)
+		qdel(src)
+	return TRUE