Merge pull request #298 from DopplerShift13/revert-284-update-10

[s] does the s even work? I think something went very wrong last update and its fuckin me up so watch this one happen

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -84092,10 +84092,10 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 4
 	},
-/obj/machinery/disposal/delivery_chute{
+/obj/effect/turf_decal/box/red,
+/obj/structure/disposaloutlet{
 	dir = 8
 	},
-/obj/effect/turf_decal/box/red,
 /turf/open/floor/engine/xenobio,
 /area/station/science/xenobiology)
 "uYg" = (

_maps/map_files/NebulaStation/NebulaStation.dmm

@@ -92160,7 +92160,8 @@
 /area/station/security/checkpoint/science)
 "nKF" = (
 /obj/item/toy/katana{
-	icon_state = "supermatter_sword"
+	icon_state = "supermatter_sword";
+	icon_angle = -45
 	},
 /obj/structure/ladder,
 /turf/open/floor/plating,

code/__DEFINES/combat.dm

@@ -154,6 +154,13 @@ DEFINE_BITFIELD(status_flags, list(
 #define ATTACK_EFFECT_MECHTOXIN "mech_toxin"
 #define ATTACK_EFFECT_BOOP "boop" //Honk
 
+/// Attack animation for sharp items
+#define ATTACK_ANIMATION_SLASH "slash"
+/// Attack animation for pointy items
+#define ATTACK_ANIMATION_PIERCE "pierce"
+/// Animation for blunt attacks
+#define ATTACK_ANIMATION_BLUNT "blunt"
+
 //the define for visible message range in combat
 #define SAMETILE_MESSAGE_RANGE 1
 #define COMBAT_MESSAGE_RANGE 3

code/__DEFINES/dcs/signals/signals_mod.dm

@@ -45,3 +45,5 @@
 #define COMSIG_MOD_TETHER_SNAP "mod_tether_snap"
 /// Called when a MOD module generats its worn overlay
 #define COMSIG_MODULE_GENERATE_WORN_OVERLAY "mod_module_generate_worn_overlay"
+/// Called when the MOD control unit fetches its visor icon
+#define COMSIG_MOD_GET_VISOR_OVERLAY "mod_get_visor_overlay"

code/__DEFINES/hud.dm

@@ -54,8 +54,10 @@
 #define ui_combo "CENTER+4:24,SOUTH+1:7" //combo meter for martial arts
 
 //Lower right, persistent menu
-#define ui_drop_throw "EAST-1:28,SOUTH+1:7"
+#define ui_rest "EAST-1:28,SOUTH+1:7"
+#define ui_drop_throw "EAST-1:28,SOUTH+1:24"
 #define ui_above_movement "EAST-2:26,SOUTH+1:7"
+#define ui_above_movement_top "EAST-2:26, SOUTH+1:24"
 #define ui_above_intent "EAST-3:24, SOUTH+1:7"
 #define ui_movi "EAST-2:26,SOUTH:5"
 #define ui_acti "EAST-3:24,SOUTH:5"
@@ -65,8 +67,7 @@
 #define ui_crafting "EAST-4:22,SOUTH:5"
 #define ui_building "EAST-4:22,SOUTH:21"
 #define ui_language_menu "EAST-4:6,SOUTH:21"
-#define ui_navigate_menu "EAST-4:22,SOUTH:5"
-#define ui_floor_changer "EAST-3:24, SOUTH+1:3"
+#define ui_navigate_menu "EAST-4:6,SOUTH:5"
 
 //Upper left (action buttons)
 #define ui_action_palette "WEST+0:23,NORTH-1:5"
@@ -100,7 +101,11 @@
 #define ui_living_healthdoll "EAST-1:28,CENTER-1:15"
 
 //Humans
-#define ui_human_floor_changer "EAST-4:22, SOUTH+1:7"
+#define ui_human_floor_changer "EAST-4:22,SOUTH:5"
+#define ui_human_crafting "EAST-3:24,SOUTH+1:7"
+#define ui_human_navigate "EAST-3:7,SOUTH+1:7"
+#define ui_human_language "EAST-3:7,SOUTH+1:24"
+#define ui_human_area "EAST-3:24,SOUTH+1:24"
 
 //Drones
 #define ui_drone_drop "CENTER+1:18,SOUTH:5"
@@ -123,7 +128,7 @@
 #define ui_borg_camera "CENTER+3:21,SOUTH:5"
 #define ui_borg_alerts "CENTER+4:21,SOUTH:5"
 #define ui_borg_language_menu "CENTER+4:19,SOUTH+1:6"
-#define ui_borg_navigate_menu "CENTER+4:19,SOUTH+1:6"
+#define ui_borg_navigate_menu "CENTER+4:3,SOUTH+1:6"
 #define ui_borg_floor_changer "EAST-1:28,SOUTH+1:39"
 
 //Aliens
@@ -132,7 +137,7 @@
 #define ui_alien_queen_finder "EAST,CENTER-3:15"
 #define ui_alien_storage_r "CENTER+1:18,SOUTH:5"
 #define ui_alien_language_menu "EAST-4:20,SOUTH:5"
-#define ui_alien_navigate_menu "EAST-4:20,SOUTH:5"
+#define ui_alien_navigate_menu "EAST-4:4,SOUTH:5"
 
 //AI
 #define ui_ai_core "BOTTOM:6,RIGHT-4"
@@ -173,7 +178,7 @@
 #define ui_pai_view_images "SOUTH:6,WEST+12"
 #define ui_pai_radio "SOUTH:6,WEST+13"
 #define ui_pai_language_menu "SOUTH+1:8,WEST+12:31"
-#define ui_pai_navigate_menu "SOUTH+1:8,WEST+12:31"
+#define ui_pai_navigate_menu "SOUTH+1:8,WEST+12:15"
 
 //Ghosts
 #define ui_ghost_spawners_menu "SOUTH:6,CENTER-3:24"
@@ -182,8 +187,8 @@
 #define ui_ghost_teleport "SOUTH:6,CENTER:24"
 #define ui_ghost_pai "SOUTH: 6, CENTER+1:24"
 #define ui_ghost_minigames "SOUTH: 6, CENTER+2:24"
-#define ui_ghost_language_menu "SOUTH: 22, CENTER+3:22"
-#define ui_ghost_floor_changer "SOUTH: 6, CENTER+3:23"
+#define ui_ghost_language_menu "SOUTH: 6, CENTER+3:24"
+#define ui_ghost_floor_changer "SOUTH: 6, CENTER+3:8"
 
 //Blobbernauts
 #define ui_blobbernaut_overmind_health "EAST-1:28,CENTER+0:19"

code/__DEFINES/is_helpers.dm

@@ -253,8 +253,6 @@ GLOBAL_LIST_INIT(turfs_pass_meteor, typecacheof(list(
 
 #define ismecha(A) (istype(A, /obj/vehicle/sealed/mecha))
 
-#define ismopable(A) (A && ((PLANE_TO_TRUE(A.plane) == FLOOR_PLANE) ? (A.layer <= FLOOR_CLEAN_LAYER) : (A.layer <= GAME_CLEAN_LAYER))) //If something can be cleaned by floor-cleaning devices such as mops or clean bots
-
 #define isorgan(A) (istype(A, /obj/item/organ))
 
 #define isclothing(A) (istype(A, /obj/item/clothing))

code/__DEFINES/layers.dm

@@ -156,9 +156,7 @@
 #define CATWALK_LAYER (14 + TOPDOWN_LAYER)
 #define LOWER_RUNE_LAYER (15 + TOPDOWN_LAYER)
 #define RUNE_LAYER (16 + TOPDOWN_LAYER)
-/// [GAME_CLEAN_LAYER] but for floors.
-/// Basically any layer below this (numerically) is "on" a floor for the purposes of washing
-#define FLOOR_CLEAN_LAYER (21 + TOPDOWN_LAYER)
+#define CLEANABLE_FLOOR_OBJECT_LAYER (21 + TOPDOWN_LAYER)
 
 //Placeholders in case the game plane and possibly other things between it and the floor plane are ever made into topdown planes
 
@@ -185,9 +183,7 @@
 #define BOT_PATH_LAYER 2.497
 #define LOW_OBJ_LAYER 2.5
 #define HIGH_PIPE_LAYER 2.54
-// Anything above this layer is not "on" a turf for the purposes of washing
-// I hate this life of ours
-#define GAME_CLEAN_LAYER 2.55
+#define CLEANABLE_OBJECT_LAYER 2.55
 #define TRAM_STRUCTURE_LAYER 2.57
 #define TRAM_FLOOR_LAYER 2.58
 #define TRAM_WALL_LAYER 2.59
@@ -201,6 +197,7 @@
 #define DOOR_HELPER_LAYER 2.72 //keep this above DOOR_ACCESS_HELPER_LAYER and OPEN_DOOR_LAYER since the others tend to have tiny sprites that tend to be covered up.
 #define PROJECTILE_HIT_THRESHHOLD_LAYER 2.75 //projectiles won't hit objects at or below this layer if possible
 #define TABLE_LAYER 2.8
+#define GIB_LAYER 2.85 // sit on top of tables, but below machines
 #define BELOW_OBJ_LAYER 2.9
 #define LOW_ITEM_LAYER 2.95
 //#define OBJ_LAYER 3 //For easy recordkeeping; this is a byond define

code/__DEFINES/reagents.dm

@@ -46,7 +46,8 @@
 ///Health threshold for synthflesh and rezadone to unhusk someone
 #define UNHUSK_DAMAGE_THRESHOLD 50
 ///Amount of synthflesh required to unhusk someone
-#define SYNTHFLESH_UNHUSK_AMOUNT 100
+#define SYNTHFLESH_UNHUSK_AMOUNT 60
+#define SYNTHFLESH_UNHUSK_MAX 100
 
 //used by chem masters and pill presses
 // The categories of reagent packaging

code/__DEFINES/traits/declarations.dm

@@ -1401,4 +1401,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 ///Trait given to atoms currently affected by projectile dampeners
 #define TRAIT_GOT_DAMPENED "got_dampened"
 
+/// Apply to movables to say "hey, this movable is technically flat on the floor, so it'd be mopped up by a mop"
+#define TRAIT_MOPABLE "mopable"
+
 // END TRAIT DEFINES

code/__HELPERS/cmp.dm

@@ -215,3 +215,8 @@
 	var/position_a = fluids_priority.Find(initial(a.required_fluid_type))
 	var/position_b = fluids_priority.Find(initial(b.required_fluid_type))
 	return cmp_numeric_asc(position_a, position_b) || cmp_text_asc(initial(b.name), initial(a.name))
+
+///Sorts stock parts based on tier
+/proc/cmp_rped_sort(obj/item/first_item, obj/item/second_item)
+	///even though stacks aren't stock parts, get_part_rating() is defined on the item level (see /obj/item/proc/get_part_rating()) and defaults to returning 0.
+	return second_item.get_part_rating() - first_item.get_part_rating()

code/__HELPERS/construction.dm

@@ -46,9 +46,9 @@
 	return 0
 
 /**
- * Splits a stack. we don't use /obj/item/stack/proc/fast_split_stack because Byond complains that should only be called asynchronously.
+ * Splits a stack. we don't use /obj/item/stack/proc/split_stack because Byond complains that should only be called asynchronously.
  * This proc is also more faster because it doesn't deal with mobs, copying evidences or refreshing atom storages
- * Has special internal uses for e.g. by the material container
+ * Has special internal uses for e.g. by the material container & RPED
  *
  * Arguments:
  * - [target][obj/item/stack]: the stack to split

code/__HELPERS/hud.dm

@@ -3,14 +3,10 @@
 	var/y_off = round((i-1) / 2)
 	return"CENTER+[x_off]:16,SOUTH+[y_off]:5"
 
-/proc/ui_equip_position(mob/M)
-	var/y_off = round((M.held_items.len-1) / 2) //values based on old equip ui position (CENTER: +/-16,SOUTH+1:5)
-	return "CENTER:-16,SOUTH+[y_off+1]:5"
-
 /proc/ui_swaphand_position(mob/M, which = LEFT_HANDS) //values based on old swaphand ui positions (CENTER: +/-16,SOUTH+1:5)
-	var/x_off = which == LEFT_HANDS ? -1 : 0
+	var/x_off = (which == LEFT_HANDS) ? -1 : null
 	var/y_off = round((M.held_items.len-1) / 2)
-	return "CENTER+[x_off]:16,SOUTH+[y_off+1]:5"
+	return "CENTER[x_off]:16,SOUTH+[y_off+1]:5"
 
 /proc/ui_perk_position(perk_count)
 	var/y_off = perk_count < 1 ? 0 : perk_count/2

code/_globalvars/traits/_traits.dm

@@ -48,7 +48,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_CHASM_STOPPER" = TRAIT_CHASM_STOPPER,
 		"TRAIT_COMBAT_MODE_SKIP_INTERACTION" = TRAIT_COMBAT_MODE_SKIP_INTERACTION,
 		"TRAIT_DEL_ON_SPACE_DUMP" = TRAIT_DEL_ON_SPACE_DUMP,
-		"TRAIT_VALID_DNA_INFUSION" = TRAIT_VALID_DNA_INFUSION,
 		"TRAIT_FROZEN" = TRAIT_FROZEN,
 		"TRAIT_HAS_LABEL" = TRAIT_HAS_LABEL,
 		"TRAIT_HEARING_SENSITIVE" = TRAIT_HEARING_SENSITIVE,
@@ -57,34 +56,36 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_IRRADIATED" = TRAIT_IRRADIATED,
 		"TRAIT_IS_AQUARIUM" = TRAIT_IS_AQUARIUM,
 		"TRAIT_LAVA_IMMUNE" = TRAIT_LAVA_IMMUNE,
+		"TRAIT_MOPABLE" = TRAIT_MOPABLE,
 		"TRAIT_MOVE_FLOATING" = TRAIT_MOVE_FLOATING,
 		"TRAIT_MOVE_FLYING" = TRAIT_MOVE_FLYING,
 		"TRAIT_MOVE_GROUND" = TRAIT_MOVE_GROUND,
 		"TRAIT_MOVE_PHASING" = TRAIT_MOVE_PHASING,
 		"TRAIT_MOVE_UPSIDE_DOWN" = TRAIT_MOVE_UPSIDE_DOWN,
-		"TRAIT_MOVE_VENTCRAWLING" = TRAIT_MOVE_VENTCRAWLING,
 		"TRAIT_MOVE_UPSIDE_DOWN" = TRAIT_MOVE_UPSIDE_DOWN,
+		"TRAIT_MOVE_VENTCRAWLING" = TRAIT_MOVE_VENTCRAWLING,
+		"TRAIT_NOT_BARFABLE" = TRAIT_NOT_BARFABLE,
+		"TRAIT_NOT_ENGRAVABLE" = TRAIT_NOT_ENGRAVABLE,
 		"TRAIT_NO_FLOATING_ANIM" = TRAIT_NO_FLOATING_ANIM,
 		"TRAIT_NO_MANIFEST_CONTENTS_ERROR" = TRAIT_NO_MANIFEST_CONTENTS_ERROR,
 		"TRAIT_NO_MISSING_ITEM_ERROR" = TRAIT_NO_MISSING_ITEM_ERROR,
 		"TRAIT_NO_THROW_HITPUSH" = TRAIT_NO_THROW_HITPUSH,
-		"TRAIT_NOT_BARFABLE" = TRAIT_NOT_BARFABLE,
-		"TRAIT_NOT_ENGRAVABLE" = TRAIT_NOT_ENGRAVABLE,
 		"TRAIT_ODD_CUSTOMIZABLE_FOOD_INGREDIENT" = TRAIT_ODD_CUSTOMIZABLE_FOOD_INGREDIENT,
 		"TRAIT_ON_HIT_EFFECT" = TRAIT_ON_HIT_EFFECT,
 		"TRAIT_RUNECHAT_HIDDEN" = TRAIT_RUNECHAT_HIDDEN,
 		"TRAIT_SCARY_FISHERMAN" = TRAIT_SCARY_FISHERMAN,
 		"TRAIT_SECLUDED_LOCATION" = TRAIT_SECLUDED_LOCATION,
+		"TRAIT_SILENT_REACTIONS" = TRAIT_SILENT_REACTIONS,
 		"TRAIT_SNOWSTORM_IMMUNE" = TRAIT_SNOWSTORM_IMMUNE,
 		"TRAIT_SPELLS_TRANSFER_TO_LOC" = TRAIT_SPELLS_TRANSFER_TO_LOC,
 		"TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH" = TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH,
 		"TRAIT_TELEKINESIS_CONTROLLED" = TRAIT_TELEKINESIS_CONTROLLED,
 		"TRAIT_UNDERFLOOR" = TRAIT_UNDERFLOOR,
 		"TRAIT_UNIQUE_IMMERSE" = TRAIT_UNIQUE_IMMERSE,
+		"TRAIT_VALID_DNA_INFUSION" = TRAIT_VALID_DNA_INFUSION,
 		"TRAIT_WADDLING" = TRAIT_WADDLING,
 		"TRAIT_WAS_RENAMED" = TRAIT_WAS_RENAMED,
 		"TRAIT_WEATHER_IMMUNE" = TRAIT_WEATHER_IMMUNE,
-		"TRAIT_SILENT_REACTIONS" = TRAIT_SILENT_REACTIONS,
 	),
 	/datum/controller/subsystem/economy = list(
 		"TRAIT_MARKET_CRASHING" = TRAIT_MARKET_CRASHING,

code/_onclick/hud/action_button.dm

@@ -110,32 +110,37 @@
 	last_hovored_ref = null
 	if(!can_use(usr))
 		return
+
 	var/datum/hud/our_hud = usr.hud_used
 	if(over_object == src)
 		our_hud.hide_landings()
 		return
+
 	if(istype(over_object, /atom/movable/screen/action_landing))
 		var/atom/movable/screen/action_landing/reserve = over_object
 		reserve.hit_by(src)
-		our_hud.hide_landings()
 		save_position()
+		our_hud.hide_landings()
 		return
 
-	our_hud.hide_landings()
 	if(istype(over_object, /atom/movable/screen/button_palette) || istype(over_object, /atom/movable/screen/palette_scroll))
 		our_hud.position_action(src, SCRN_OBJ_IN_PALETTE)
 		save_position()
+		our_hud.hide_landings()
 		return
+
 	if(istype(over_object, /atom/movable/screen/movable/action_button))
 		var/atom/movable/screen/movable/action_button/button = over_object
 		our_hud.position_action_relative(src, button)
 		save_position()
+		our_hud.hide_landings()
 		return
 
 	. = ..()
 
 	our_hud.position_action(src, screen_loc)
 	save_position()
+	our_hud.hide_landings()
 
 /atom/movable/screen/movable/action_button/proc/save_position()
 	var/mob/user = our_hud.mymob
@@ -290,6 +295,7 @@
 /atom/movable/screen/button_palette/proc/set_hud(datum/hud/our_hud)
 	src.our_hud = our_hud
 	refresh_owner()
+	disable_landing() // If our hud already has elements, don't force hide us
 
 /atom/movable/screen/button_palette/update_name(updates)
 	. = ..()
@@ -311,6 +317,15 @@
 
 	icon_state = "[ui_name]_palette"
 
+/atom/movable/screen/button_palette/proc/activate_landing()
+	// Reveal ourselves to the user
+	invisibility = INVISIBILITY_NONE
+
+/atom/movable/screen/button_palette/proc/disable_landing()
+	// If we have no elements in the palette, hide your ugly self please
+	if (!length(our_hud.palette_actions?.actions))
+		invisibility = INVISIBILITY_ABSTRACT
+
 /atom/movable/screen/button_palette/MouseEntered(location, control, params)
 	. = ..()
 	if(QDELETED(src))

code/_onclick/hud/alien.dm

@@ -39,13 +39,13 @@
 	using = new /atom/movable/screen/swap_hand(null, src)
 	using.icon = ui_style
 	using.icon_state = "swap_1"
-	using.screen_loc = ui_swaphand_position(owner,1)
+	using.screen_loc = ui_swaphand_position(owner, 1)
 	static_inventory += using
 
 	using = new /atom/movable/screen/swap_hand(null, src)
 	using.icon = ui_style
 	using.icon_state = "swap_2"
-	using.screen_loc = ui_swaphand_position(owner,2)
+	using.screen_loc = ui_swaphand_position(owner, 2)
 	static_inventory += using
 
 	action_intent = new /atom/movable/screen/combattoggle/flashy(null, src)
@@ -61,7 +61,6 @@
 
 	floor_change = new /atom/movable/screen/floor_changer(null, src)
 	floor_change.icon = ui_style
-	floor_change.screen_loc = ui_above_intent
 	static_inventory += floor_change
 
 	using = new/atom/movable/screen/language_menu(null, src)
@@ -77,11 +76,11 @@
 	using.screen_loc = ui_drop_throw
 	static_inventory += using
 
-	using = new /atom/movable/screen/resist(null, src)
-	using.icon = ui_style
-	using.screen_loc = ui_above_movement
-	using.update_appearance()
-	hotkeybuttons += using
+	resist_icon = new /atom/movable/screen/resist(null, src)
+	resist_icon.icon = ui_style
+	resist_icon.screen_loc = ui_above_movement
+	resist_icon.update_appearance()
+	hotkeybuttons += resist_icon
 
 	throw_icon = new /atom/movable/screen/throw_catch(null, src)
 	throw_icon.icon = ui_style

code/_onclick/hud/alien_larva.dm

@@ -12,7 +12,6 @@
 
 	floor_change = new /atom/movable/screen/floor_changer(null, src)
 	floor_change.icon = ui_style
-	floor_change.screen_loc = ui_above_intent
 	static_inventory += floor_change
 
 	healths = new /atom/movable/screen/healths/alien(null, src)