[IDB Ignore] Felinid is dead, long live Animid (MrMelbert#812)

Author: MrMelbert

.vscode/settings.json

@@ -25,5 +25,6 @@
 	"search.exclude": {
 		"**/node_modules": true
 	},
-	"Lua.diagnostics.enable": false
+	"Lua.diagnostics.enable": false,
+	"tgstationTestExplorer.project.DMEName": "maplestation.dme"
 }

code/__DEFINES/food.dm

@@ -15,10 +15,9 @@
 #define CLOTH (1<<14)
 #define NUTS (1<<15)
 #define SEAFOOD (1<<16)
-#define ORANGES (1<<17)
-#define BUGS (1<<18)
-#define GORE (1<<19)
-#define STONE (1<<20)
+#define BUGS (1<<17)
+#define GORE (1<<18)
+#define STONE (1<<19)
 
 DEFINE_BITFIELD(foodtypes, list(
 	"MEAT" = MEAT,
@@ -38,7 +37,6 @@ DEFINE_BITFIELD(foodtypes, list(
 	"CLOTH" = CLOTH,
 	"NUTS" = NUTS,
 	"SEAFOOD" = SEAFOOD,
-	"ORANGES" = ORANGES,
 	"BUGS" = BUGS,
 	"GORE" = GORE,
 	"STONE" = STONE,
@@ -63,7 +61,6 @@ DEFINE_BITFIELD(foodtypes, list(
 	"CLOTH", \
 	"NUTS", \
 	"SEAFOOD", \
-	"ORANGES", \
 	"BUGS", \
 	"GORE", \
 	"STONE", \

code/__DEFINES/is_helpers.dm

@@ -112,6 +112,7 @@ GLOBAL_LIST_INIT(turfs_pass_meteor, typecacheof(list(
 #define isskeleton(A) (is_species(A, /datum/species/skeleton))
 #define ismoth(A) (is_species(A, /datum/species/moth))
 #define isfelinid(A) (is_species(A, /datum/species/human/felinid))
+#define isanimid(A) (is_species(A, /datum/species/human/animid))
 #define isethereal(A) (is_species(A, /datum/species/ethereal))
 #define isvampire(A) (is_species(A,/datum/species/vampire))
 #define isdullahan(A) (is_species(A, /datum/species/dullahan))

code/__DEFINES/mobs.dm

@@ -110,6 +110,7 @@
 #define SPECIES_ETHEREAL "ethereal"
 #define SPECIES_ETHEREAL_LUSTROUS "lustrous"
 #define SPECIES_FELINE "felinid"
+#define SPECIES_ANIMALID "animid"
 #define SPECIES_FLYPERSON "fly"
 #define SPECIES_HUMAN "human"
 #define SPECIES_JELLYPERSON "jelly"
@@ -142,14 +143,6 @@
 #define BODYPART_ID_PSYKER "psyker"
 #define BODYPART_ID_MEAT "meat"
 
-//See: datum/species/var/digitigrade_customization
-///The species does not have digitigrade legs in generation.
-#define DIGITIGRADE_NEVER 0
-///The species can have digitigrade legs in generation
-#define DIGITIGRADE_OPTIONAL 1
-///The species is forced to have digitigrade legs in generation.
-#define DIGITIGRADE_FORCED 2
-
 // Preferences for leg types
 /// Legs that are normal
 #define NORMAL_LEGS "Normal Legs"
@@ -952,6 +945,20 @@ GLOBAL_LIST_INIT(layers_to_offset, list(
 /// Types of bullets that mining mobs take full damage from
 #define MINING_MOB_PROJECTILE_VULNERABILITY list(BRUTE)
 
+// Sprites for photocopying butts
+#define BUTT_SPRITE_HUMAN_MALE "human_male"
+#define BUTT_SPRITE_HUMAN_FEMALE "human_female"
+#define BUTT_SPRITE_LIZARD "lizard"
+#define BUTT_SPRITE_QR_CODE "qr_code"
+#define BUTT_SPRITE_XENOMORPH "xeno"
+#define BUTT_SPRITE_DRONE "drone"
+#define BUTT_SPRITE_CAT "cat"
+#define BUTT_SPRITE_FLOWERPOT "flowerpot"
+#define BUTT_SPRITE_GREY "grey"
+#define BUTT_SPRITE_PLASMA "plasma"
+#define BUTT_SPRITE_FUZZY "fuzzy"
+#define BUTT_SPRITE_SLIME "slime"
+
 /// Distance which you can see someone's ID card
 /// Short enough that you can inspect over tables (bartender checking age)
 #define ID_EXAMINE_DISTANCE 3

code/__DEFINES/preferences.dm

@@ -122,6 +122,9 @@
 /// These will be shown in the character sidebar, but at the bottom.
 #define PREFERENCE_CATEGORY_FEATURES "features"
 
+/// These will be shown in the character sidebar, in the middle.
+#define PREFERENCE_CATEGORY_HAIR "hair"
+
 /// Any preferences that will show to the sides of the character in the setup menu.
 #define PREFERENCE_CATEGORY_CLOTHING "clothing"
 

code/__DEFINES/surgery.dm

@@ -71,8 +71,10 @@
 #define HEAD_DEBRAIN (1<<6)
 /// Head will never be disfigured by damage
 #define HEAD_NO_DISFIGURE (1<<7)
+/// Show organs (like brain) when examined with examine verb
+#define HEAD_SHOW_ORGANS_ON_EXAMINE (1<<8)
 /// Default for most heads
-#define HEAD_DEFAULT_FEATURES (HEAD_HAIR|HEAD_FACIAL_HAIR|HEAD_LIPS|HEAD_EYESPRITES|HEAD_EYECOLOR|HEAD_EYEHOLES|HEAD_DEBRAIN)
+#define HEAD_DEFAULT_FEATURES (HEAD_HAIR|HEAD_FACIAL_HAIR|HEAD_LIPS|HEAD_EYESPRITES|HEAD_EYECOLOR|HEAD_EYEHOLES|HEAD_DEBRAIN|HEAD_SHOW_ORGANS_ON_EXAMINE)
 
 /// Return value when the surgery step fails :(
 #define SURGERY_STEP_FAIL -1

code/__DEFINES/traits/declarations.dm

@@ -1226,6 +1226,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// Prevents items from being speed potion-ed, but allows their speed to be altered in other ways
 #define TRAIT_NO_SPEED_POTION "no_speed_potion"
 
+/// Makes the mob immune to carpotoxin
+#define TRAIT_CARPOTOXIN_IMMUNE "carpotoxin_immune"
+
 /// Mob gets far less severe negative moodlets from seeing death / blood
 #define TRAIT_DESENSITIZED "desensitized"
 

code/_globalvars/bitfields.dm

@@ -511,7 +511,6 @@ DEFINE_BITFIELD(liked_foodtypes, list(
 	"CLOTH" = CLOTH,
 	"NUTS" = NUTS,
 	"SEAFOOD" = SEAFOOD,
-	"ORANGES" = ORANGES,
 	"BUGS" = BUGS,
 	"GORE" = GORE,
 	"STONE" = STONE,
@@ -535,7 +534,6 @@ DEFINE_BITFIELD(disliked_foodtypes, list(
 	"CLOTH" = CLOTH,
 	"NUTS" = NUTS,
 	"SEAFOOD" = SEAFOOD,
-	"ORANGES" = ORANGES,
 	"BUGS" = BUGS,
 	"GORE" = GORE,
 	"STONE" = STONE,
@@ -559,7 +557,6 @@ DEFINE_BITFIELD(toxic_foodtypes, list(
 	"CLOTH" = CLOTH,
 	"NUTS" = NUTS,
 	"SEAFOOD" = SEAFOOD,
-	"ORANGES" = ORANGES,
 	"BUGS" = BUGS,
 	"GORE" = GORE,
 	"STONE" = STONE,

code/_globalvars/phobias.dm

@@ -4,7 +4,6 @@
 /// Also determines what phobias you can choose as your preference with the quirk.
 GLOBAL_LIST_INIT(phobia_types, sort_list(list(
 	"aliens",
-	"anime",
 	"authority",
 	"birds",
 	"blood",
@@ -29,7 +28,6 @@ GLOBAL_LIST_INIT(phobia_types, sort_list(list(
 
 GLOBAL_LIST_INIT(phobia_regexes, list(
 	"aliens" = construct_phobia_regex("aliens"),
-	"anime" = construct_phobia_regex("anime"),
 	"authority" = construct_phobia_regex("authority"),
 	"birds" = construct_phobia_regex("birds"),
 	"blood" = construct_phobia_regex("blood"),
@@ -59,7 +57,6 @@ GLOBAL_LIST_INIT(phobia_mobs, list(
 		/mob/living/carbon/alien,
 		/mob/living/simple_animal/slime,
 	)),
-	"anime" = typecacheof(list(/mob/living/basic/guardian)),
 	"birds" = typecacheof(list(
 		/mob/living/basic/chick,
 		/mob/living/basic/chicken,
@@ -148,24 +145,6 @@ GLOBAL_LIST_INIT(phobia_objs, list(
 		/obj/structure/table/abductor,
 		/obj/structure/table/optable/abductor,
 	)),
-	"anime" = typecacheof(list(
-		/obj/item/clothing/head/costume/kitty/genuine,
-		/obj/item/clothing/mask/gas/ninja,
-		/obj/item/clothing/under/syndicate/ninja,
-		/obj/item/clothing/under/costume/schoolgirl,
-		/obj/item/energy_katana,
-		/obj/item/food/chawanmushi,
-		/obj/item/food/sashimi,
-		/obj/item/highfrequencyblade,
-		/obj/item/katana,
-		/obj/item/nullrod/claymore/katana,
-		/obj/item/nullrod/vibro,
-		/obj/item/reagent_containers/cup/glass/bottle/sake,
-		/obj/item/throwing_star,
-		/obj/item/toy/katana,
-		/obj/structure/mineral_door/paperframe,
-		/obj/structure/window/paperframe,
-	)),
 	"authority" = typecacheof(list(
 		/obj/item/card/id/advanced/centcom,
 		/obj/item/card/id/advanced/gold,
@@ -553,7 +532,6 @@ GLOBAL_LIST_INIT(phobia_species, list(
 		/datum/species/pod,
 		/datum/species/shadow,
 	)),
-	"anime" = typecacheof(list(/datum/species/human/felinid)),
 	"conspiracies" = typecacheof(list(
 		/datum/species/abductor,
 		/datum/species/lizard,

code/_globalvars/traits/_traits.dm

@@ -167,6 +167,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_CAN_SIGN_ON_COMMS" = TRAIT_CAN_SIGN_ON_COMMS,
 		"TRAIT_CAN_STRIP" = TRAIT_CAN_STRIP,
 		"TRAIT_CAN_USE_NUKE" = TRAIT_CAN_USE_NUKE,
+		"TRAIT_CARPOTOXIN_IMMUNE" = TRAIT_CARPOTOXIN_IMMUNE,
 		"TRAIT_CATLIKE_GRACE" = TRAIT_CATLIKE_GRACE,
 		"TRAIT_CHANGELING_HIVEMIND_MUTE" = TRAIT_CHANGELING_HIVEMIND_MUTE,
 		"TRAIT_CHASM_DESTROYED" = TRAIT_CHASM_DESTROYED,