Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG …

…into upstream-mirror-25159

_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_icewalker_lower.dmm

@@ -1873,6 +1873,7 @@
 /obj/item/seeds/tower{
 	pixel_y = -3
 	},
+/obj/item/seeds/glowshroom,
 /obj/item/seeds/poppy,
 /obj/item/seeds/reishi,
 /obj/item/seeds/reishi,

_maps/RandomRuins/SpaceRuins/mimesvsclowns.dmm

@@ -6,6 +6,11 @@
 /area/ruin)
 "dI" = (
 /obj/item/grown/bananapeel,
+/obj/item/ammo_casing/a357/spent{
+	dir = 9;
+	pixel_x = -13;
+	pixel_y = 10
+	},
 /turf/open/floor/iron/checker/airless,
 /area/ruin)
 "ef" = (
@@ -71,20 +76,21 @@
 /obj/machinery/atmospherics/components/unary/passive_vent{
 	dir = 4
 	},
-/obj/item/ammo_casing/energy/c3dbullet{
-	pixel_y = 10;
-	pixel_x = 115;
-	dir = 9
-	},
 /obj/effect/decal/cleanable/blood/gibs,
 /obj/machinery/light/small/broken/directional/south,
+/obj/item/ammo_casing/a357/spent,
 /turf/open/floor/iron/checker/airless,
 /area/ruin)
 "uc" = (
-/obj/item/ammo_casing/energy/c3dbullet,
 /obj/effect/decal/cleanable/blood/footprints{
 	dir = 4
 	},
+/obj/item/ammo_casing/a357/spent{
+	pixel_x = -5;
+	dir = 5;
+	pixel_y = 6
+	},
+/obj/item/ammo_casing/a357/spent,
 /obj/item/gps/spaceruin,
 /turf/open/floor/plating/airless,
 /area/ruin)
@@ -139,11 +145,6 @@
 /turf/open/floor/iron/checker/airless,
 /area/ruin)
 "Ar" = (
-/obj/item/ammo_casing/energy/c3dbullet{
-	dir = 5;
-	pixel_x = 59;
-	pixel_y = 6
-	},
 /obj/item/clothing/mask/gas/clown_hat{
 	pixel_y = 39
 	},
@@ -216,7 +217,6 @@
 /area/ruin)
 "JK" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber,
-/obj/item/ammo_casing/energy/c3dbullet,
 /obj/effect/decal/cleanable/blood/gibs/up,
 /turf/open/floor/plating/airless,
 /area/ruin)
@@ -252,8 +252,8 @@
 /area/ruin)
 "Pq" = (
 /obj/machinery/light/broken/directional/north,
-/obj/item/ammo_casing/energy/c3dbullet,
 /obj/structure/reagent_dispensers/watertank,
+/obj/item/ammo_casing/a357/spent,
 /turf/open/floor/iron/checker/airless,
 /area/ruin)
 "Qb" = (
@@ -267,7 +267,6 @@
 /turf/open/floor/iron/checker/airless,
 /area/ruin)
 "Vj" = (
-/obj/structure/grille,
 /obj/effect/spawner/structure/window/reinforced,
 /obj/effect/mapping_helpers/damaged_window,
 /obj/effect/decal/cleanable/blood/splatter/over_window,

_maps/map_files/Birdshot/birdshot.dmm

@@ -16109,7 +16109,7 @@
 /obj/structure/chair/office/light{
 	dir = 4
 	},
-/mob/living/simple_animal/parrot/poly,
+/mob/living/basic/parrot/poly,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -34717,7 +34717,7 @@
 /obj/structure/filingcabinet/chestdrawer,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /obj/machinery/newscaster/directional/north,
-/mob/living/simple_animal/parrot/poly,
+/mob/living/basic/parrot/poly,
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/ce)
 "iDq" = (

_maps/map_files/IceBoxStation/IceBoxStation.dmm

@@ -4597,7 +4597,7 @@
 "bup" = (
 /obj/structure/filingcabinet/chestdrawer,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
-/mob/living/simple_animal/parrot/poly,
+/mob/living/basic/parrot/poly,
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/ce)
 "buv" = (

_maps/map_files/KiloStation2/KiloStation2.dmm

@@ -72595,7 +72595,7 @@
 	pixel_x = 12
 	},
 /obj/item/radio/intercom/directional/east,
-/mob/living/simple_animal/parrot/poly,
+/mob/living/basic/parrot/poly,
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/ce)
 "xjr" = (

_maps/map_files/MetaStation/MetaStation.dmm

@@ -3105,7 +3105,7 @@
 "bdV" = (
 /obj/structure/filingcabinet/chestdrawer,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
-/mob/living/simple_animal/parrot/poly,
+/mob/living/basic/parrot/poly,
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/ce)
 "beo" = (

_maps/map_files/NSSJourney/NSSJourney.dmm

@@ -26469,7 +26469,7 @@
 /obj/structure/filingcabinet/chestdrawer,
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable,
-/mob/living/simple_animal/parrot/poly,
+/mob/living/basic/parrot/poly,
 /obj/effect/turf_decal/siding/thinplating{
 	dir = 8
 	},

_maps/map_files/NSVBlueshift/Blueshift.dmm

@@ -120550,7 +120550,7 @@
 	dir = 1
 	},
 /obj/structure/filingcabinet/chestdrawer,
-/mob/living/simple_animal/parrot/poly,
+/mob/living/basic/parrot/poly,
 /obj/machinery/light_switch/directional/north,
 /turf/open/floor/iron/white/corner,
 /area/station/command/heads_quarters/ce)

_maps/map_files/NorthStar/north_star.dmm

@@ -6819,7 +6819,7 @@
 /obj/machinery/computer/security/telescreen/engine{
 	name = "Engineering and atmospherics monitor"
 	},
-/mob/living/simple_animal/parrot/poly,
+/mob/living/basic/parrot/poly,
 /turf/open/floor/catwalk_floor/iron_dark,
 /area/station/command/heads_quarters/ce)
 "bIQ" = (

_maps/map_files/VoidRaptor/VoidRaptor.dmm

@@ -35989,7 +35989,7 @@
 /turf/open/floor/circuit/green,
 /area/station/ai_monitored/command/nuke_storage)
 "kmm" = (
-/mob/living/simple_animal/parrot/poly,
+/mob/living/basic/parrot/poly,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/carpet/orange,

_maps/map_files/tramstation/tramstation.dmm

@@ -47566,7 +47566,7 @@
 	},
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable,
-/mob/living/simple_animal/parrot/poly,
+/mob/living/basic/parrot/poly,
 /turf/open/floor/iron,
 /area/station/command/heads_quarters/ce)
 "pWt" = (

_maps/shuttles/emergency_hugcage.dmm

@@ -31,7 +31,7 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
 "dz" = (
-/mob/living/simple_animal/parrot/natural{
+/mob/living/basic/parrot{
 	melee_damage_upper = 5
 	},
 /turf/open/floor/mineral/titanium/blue,

_maps/shuttles/ruin_pirate_cutter.dmm

@@ -702,7 +702,7 @@
 "Ry" = (
 /obj/structure/rack,
 /obj/item/storage/bag/money/vault,
-/mob/living/simple_animal/parrot{
+/mob/living/basic/parrot{
 	faction = list("pirate");
 	name = "Pegwing"
 	},

_maps/virtual_domains/pirates.dmm

@@ -801,7 +801,7 @@
 /area/virtual_domain/fullbright)
 "Pz" = (
 /obj/structure/table/wood,
-/mob/living/simple_animal/parrot{
+/mob/living/basic/parrot{
 	name = "pepper"
 	},
 /turf/open/floor/carpet/blue,

code/__DEFINES/_flags.dm

@@ -163,6 +163,11 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define FLOATING (1<<3)
 /// When moving, will Cross() everything, but won't stop or Bump() anything.
 #define PHASING (1<<4)
+/// The mob is walking on the ceiling. Or is generally just, upside down.
+#define UPSIDE_DOWN (1<<5)
+
+/// Combination flag for movetypes which, for all intents and purposes, mean the mob is not touching the ground
+#define MOVETYPES_NOT_TOUCHING_GROUND (FLYING|FLOATING|UPSIDE_DOWN)
 
 //Fire and Acid stuff, for resistance_flags
 #define LAVA_PROOF (1<<0)

code/__DEFINES/ai/pets.dm

@@ -27,3 +27,27 @@
 #define BB_FIND_MOM_TYPES "BB_find_mom_types"
 ///list of types of mobs we must ignore
 #define BB_IGNORE_MOM_TYPES "BB_ignore_mom_types"
+
+/// The current string that this parrot will repeat back to someone
+#define BB_PARROT_REPEAT_STRING "BB_parrot_repeat_string"
+/// The odds that this parrot will repeat back a string
+#define BB_PARROT_REPEAT_PROBABILITY "BB_parrot_repeat_probability"
+/// The odds that this parrot will choose another string to repeat
+#define BB_PARROT_PHRASE_CHANGE_PROBABILITY "BB_parrot_phrase_change_probability"
+/// A copy of the string buffer that we end the shift with. DO NOT ACCESS THIS DIRECTLY - YOU SHOULD USE THE COMPONENT IN MOST CASES
+#define BB_EXPORTABLE_STRING_BUFFER_LIST "BB_parrot_repeat_string_buffer"
+/// The types of perches we desire to use
+#define BB_PARROT_PERCH_TYPES "BB_parrot_perch_types"
+/// key that holds our perch target
+#define BB_PERCH_TARGET "perch_target"
+/// key that holds our theft item target
+#define BB_HOARD_ITEM_TARGET "hoard_item_target"
+/// key that holds the mob we will steal from
+#define BB_THEFT_VICTIM "theft_victim"
+/// key that holds the turf we will be hauling stolen items to
+#define BB_HOARD_LOCATION "hoard_location"
+/// key that holds the minimum range we must be from the hoard spot
+#define BB_HOARD_LOCATION_RANGE "hoard_location_range"
+/// key that holds items we arent interested in hoarding
+#define BB_IGNORE_ITEMS "ignore_items"
+

code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm

@@ -47,13 +47,17 @@
 #define COMSIG_MOVABLE_THROW_LANDED "movable_throw_landed"
 ///from base of atom/movable/on_changed_z_level(): (turf/old_turf, turf/new_turf, same_z_layer)
 #define COMSIG_MOVABLE_Z_CHANGED "movable_ztransit"
+///called before hearing a message from atom/movable/Hear():
+#define COMSIG_MOVABLE_PRE_HEAR "movable_pre_hear"
+	///cancel hearing the message because we're doing something else presumably
+	#define COMSIG_MOVABLE_CANCEL_HEARING (1<<0)
 ///from base of atom/movable/Hear(): (proc args list(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, list/message_mods = list(), message_range))
 #define COMSIG_MOVABLE_HEAR "movable_hear"
-	//#define HEARING_MESSAGE 1 - (I'm pretty sure this is never really used and can be gutted)
+	#define HEARING_MESSAGE 1
 	#define HEARING_SPEAKER 2
 	#define HEARING_LANGUAGE 3
 	#define HEARING_RAW_MESSAGE 4
-	//#define HEARING_RADIO_FREQ 5
+	#define HEARING_RADIO_FREQ 5
 	#define HEARING_SPANS 6
 	#define HEARING_MESSAGE_MODE 7
 	#define HEARING_RANGE 8

code/__DEFINES/dcs/signals/signals_mob/signals_mob_ai.dm

@@ -3,3 +3,4 @@
 
 /// Signal sent when a blackboard key is cleared
 #define COMSIG_AI_BLACKBOARD_KEY_CLEARED(blackboard_key) "ai_blackboard_key_clear_[blackboard_key]"
+

code/__DEFINES/dcs/signals/signals_mob/signals_mob_basic.dm

@@ -5,3 +5,10 @@
 
 ///from the ranged_attacks component for basic mobs: (mob/living/basic/firer, atom/target, modifiers)
 #define COMSIG_BASICMOB_POST_ATTACK_RANGED "basicmob_post_attack_ranged"
+
+/// Sent from /datum/ai_planning_subtree/parrot_as_in_repeat() : ()
+#define COMSIG_NEEDS_NEW_PHRASE "parrot_needs_new_phrase"
+	#define NO_NEW_PHRASE_AVAILABLE (1<<0) //! Cancel to try again later for when we actually get a new phrase
+
+/// Called whenever an animal is pet via the /datum/element/pet_bonus element: (mob/living/petter, modifiers)
+#define COMSIG_ANIMAL_PET "animal_pet"

code/__DEFINES/traits/declarations.dm

@@ -83,6 +83,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_NO_TRANSFORM "block_transformations"
 /// Tracks whether we're gonna be a baby alien's mummy.
 #define TRAIT_XENO_HOST "xeno_host"
+/// This parrot is currently perched
+#define TRAIT_PARROT_PERCHED "parrot_perched"
 /// This mob is immune to stun causing status effects and stamcrit.
 /// Prefer to use [/mob/living/proc/check_stun_immunity] over checking for this trait exactly.
 #define TRAIT_STUNIMMUNE "stun_immunity"
@@ -529,6 +531,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_MOVE_VENTCRAWLING "move_ventcrawling"
 #define TRAIT_MOVE_FLOATING "move_floating"
 #define TRAIT_MOVE_PHASING "move_phasing"
+#define TRAIT_MOVE_UPSIDE_DOWN "move_upside_down"
 /// Disables the floating animation. See above.
 #define TRAIT_NO_FLOATING_ANIM "no-floating-animation"
 
@@ -841,7 +844,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// changelings with this trait can no longer talk over the hivemind
 #define TRAIT_CHANGELING_HIVEMIND_MUTE "ling_mute"
 #define TRAIT_HULK "hulk"
-
 /// Isn't attacked harmfully by blob structures
 #define TRAIT_BLOB_ALLY "blob_ally"
 

code/__DEFINES/traits/sources.dm

@@ -136,6 +136,7 @@
 #define SPECIES_FLIGHT_TRAIT "species-flight"
 #define FROSTMINER_ENRAGE_TRAIT "frostminer-enrage"
 #define NO_GRAVITY_TRAIT "no-gravity"
+#define NEGATIVE_GRAVITY_TRAIT "negative-gravity"
 
 /// A trait gained from a mob's leap action, like the leaper
 #define LEAPING_TRAIT "leaping"

code/__DEFINES/~skyrat_defines/atom_hud.dm

@@ -1,6 +1,5 @@
 //SR Security
 #define SECHUD_CORRECTIONS_OFFICER "hudcorrectionsofficer"
-#define SECHUD_SECURITY_MEDIC "hudsecuritymedic"
 //SR Departmental Guards
 #define SECHUD_ENGINEERING_GUARD "hudengineeringguard"
 #define SECHUD_ORDERLY "hudorderly"

code/_globalvars/bitfields.dm

@@ -283,6 +283,7 @@ DEFINE_BITFIELD(movement_type, list(
 	"GROUND" = GROUND,
 	"PHASING" = PHASING,
 	"VENTCRAWLING" = VENTCRAWLING,
+	"UPSIDE_DOWN" = UPSIDE_DOWN,
 ))
 
 DEFINE_BITFIELD(obj_flags, list(

code/_globalvars/phobias.dm

@@ -61,8 +61,8 @@ GLOBAL_LIST_INIT(phobia_mobs, list(
 	"birds" = typecacheof(list(
 		/mob/living/basic/chick,
 		/mob/living/basic/chicken,
+		/mob/living/basic/parrot,
 		/mob/living/basic/pet/penguin,
-		/mob/living/simple_animal/parrot,
 	)),
 	"conspiracies" = typecacheof(list(
 		/mob/living/basic/drone,

code/_globalvars/traits/_traits.dm

@@ -48,6 +48,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_MOVE_GROUND" = TRAIT_MOVE_GROUND,
 		"TRAIT_MOVE_PHASING" = TRAIT_MOVE_PHASING,
 		"TRAIT_MOVE_VENTCRAWLING" = TRAIT_MOVE_VENTCRAWLING,
+		"TRAIT_MOVE_UPSIDE_DOWN" = TRAIT_MOVE_UPSIDE_DOWN,
 		"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,
@@ -569,6 +570,7 @@ GLOBAL_LIST_INIT(movement_type_trait_to_flag, list(
 	TRAIT_MOVE_VENTCRAWLING = VENTCRAWLING,
 	TRAIT_MOVE_FLOATING = FLOATING,
 	TRAIT_MOVE_PHASING = PHASING,
+	TRAIT_MOVE_UPSIDE_DOWN = UPSIDE_DOWN,
 ))
 
 GLOBAL_LIST_INIT(movement_type_addtrait_signals, set_movement_type_addtrait_signals())

code/_globalvars/traits/admin_tooling.dm

@@ -15,6 +15,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_MOVE_GROUND" = TRAIT_MOVE_GROUND,
 		"TRAIT_MOVE_PHASING" = TRAIT_MOVE_PHASING,
 		"TRAIT_MOVE_VENTCRAWLING" = TRAIT_MOVE_VENTCRAWLING,
+		"TRAIT_MOVE_UPSIDE_DOWN" = TRAIT_MOVE_UPSIDE_DOWN,
 		"TRAIT_RUNECHAT_HIDDEN" = TRAIT_RUNECHAT_HIDDEN,
 		"TRAIT_SNOWSTORM_IMMUNE" = TRAIT_SNOWSTORM_IMMUNE,
 		"TRAIT_VOIDSTORM_IMMUNE" = TRAIT_VOIDSTORM_IMMUNE,