Merge pull request #12206 from Fox-McCloud/refactors-corgis

Refactors Corgis and Other Doggos

code/game/objects/items.dm

@@ -64,6 +64,10 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 	var/block_chance = 0
 	var/hit_reaction_chance = 0 //If you want to have something unrelated to blocking/armour piercing etc. Maybe not needed, but trying to think ahead/allow more freedom
 
+	// Needs to be in /obj/item because corgis can wear a lot of
+	// non-clothing items
+	var/datum/dog_fashion/dog_fashion = null
+
 	var/mob/thrownby = null
 
 	//So items can have custom embedd values

code/game/objects/items/devices/radio/headset.dm

@@ -20,6 +20,7 @@
 
 	var/ks1type = null
 	var/ks2type = null
+	dog_fashion = null
 
 /obj/item/radio/headset/New()
 	..()

code/game/objects/items/devices/radio/intercom.dm

@@ -10,6 +10,7 @@
 	var/circuitry_installed = 1
 	var/last_tick //used to delay the powercheck
 	var/buildstage = 0
+	dog_fashion = null
 
 /obj/item/radio/intercom/custom
 	name = "station intercom (Custom)"

code/game/objects/items/devices/radio/radio.dm

@@ -22,6 +22,7 @@ var/global/list/default_medbay_channels = list(
 /obj/item/radio
 	icon = 'icons/obj/radio.dmi'
 	name = "station bounced radio"
+	dog_fashion = /datum/dog_fashion/back
 	suffix = "\[3\]"
 	icon_state = "walkietalkie"
 	item_state = "walkietalkie"
@@ -396,7 +397,7 @@ var/global/list/default_medbay_channels = list(
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
 		displayname = H.voice
-		if(H.voice != real_name)	
+		if(H.voice != real_name)
 			voicemask = TRUE
 
 	if(syndiekey && syndiekey.change_voice && connection.frequency == SYND_FREQ)
@@ -653,6 +654,7 @@ var/global/list/default_medbay_channels = list(
 	icon_state = "radio"
 	canhear_range = 0
 	subspace_transmission = 1
+	dog_fashion = null
 
 /obj/item/radio/borg/syndicate
 	keyslot = new /obj/item/encryptionkey/syndicate/nukeops
@@ -840,6 +842,7 @@ var/global/list/default_medbay_channels = list(
 
 /obj/item/radio/off
 	listening = 0
+	dog_fashion = /datum/dog_fashion/back
 
 /obj/item/radio/phone
 	broadcasting = 0
@@ -847,6 +850,7 @@ var/global/list/default_medbay_channels = list(
 	icon_state = "red_phone"
 	listening = 1
 	name = "phone"
+	dog_fashion = null
 
 /obj/item/radio/phone/medbay
 	frequency = MED_I_FREQ

code/game/objects/items/weapons/extinguisher.dm

@@ -14,6 +14,7 @@
 	container_type = AMOUNT_VISIBLE
 	materials = list(MAT_METAL=90)
 	attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
+	dog_fashion = /datum/dog_fashion/back
 	var/max_water = 50
 	var/last_use = 1.0
 	var/safety = 1
@@ -35,6 +36,7 @@
 	materials = list()
 	max_water = 30
 	sprite_name = "miniFE"
+	dog_fashion = null
 
 /obj/item/extinguisher/examine(mob/user)
 	. = ..()

code/game/objects/items/weapons/grenades/clusterbuster.dm

@@ -230,12 +230,12 @@
 /obj/item/grenade/clusterbuster/fluffy
 	name = "Fluffy Love Bomb"
 	desc = "Exactly as snuggly as it sounds."
-	payload = /mob/living/simple_animal/pet/corgi/puppy
+	payload = /mob/living/simple_animal/pet/dog/corgi/puppy
 
 /obj/item/grenade/clusterbuster/fox
 	name = "Troublemaking Grenade"
 	desc = "More trouble than two foxes combined."
-	payload = /mob/living/simple_animal/pet/fox
+	payload = /mob/living/simple_animal/pet/dog/fox
 
 /obj/item/grenade/clusterbuster/crab
 	name = "Crab Grenade"

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -15,6 +15,7 @@
 	desc = "A tank of oxygen."
 	icon_state = "oxygen"
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
+	dog_fashion = /datum/dog_fashion/back
 
 
 /obj/item/tank/oxygen/New()
@@ -34,10 +35,12 @@ obj/item/tank/oxygen/empty/New()
 /obj/item/tank/oxygen/yellow
 	desc = "A tank of oxygen, this one is yellow."
 	icon_state = "oxygen_f"
+	dog_fashion = null
 
 /obj/item/tank/oxygen/red
 	desc = "A tank of oxygen, this one is red."
 	icon_state = "oxygen_fr"
+	dog_fashion = null
 
 
 /*

code/game/objects/structures/bedsheet_bin.dm

@@ -19,6 +19,7 @@ LINEN BINS
 	burn_state = FLAMMABLE
 	slot_flags = SLOT_BACK
 
+	dog_fashion = /datum/dog_fashion/head/ghost
 	var/list/dream_messages = list("white")
 	var/list/nightmare_messages = list("black")
 	var/comfort = 0.5

code/game/objects/structures/crates_lockers/crittercrate.dm

@@ -33,11 +33,11 @@
 
 /obj/structure/closet/critter/corgi
 	name = "corgi crate"
-	content_mob = /mob/living/simple_animal/pet/corgi
+	content_mob = /mob/living/simple_animal/pet/dog/corgi
 
 /obj/structure/closet/critter/corgi/New()
 	if(prob(50))
-		content_mob = /mob/living/simple_animal/pet/corgi/Lisa
+		content_mob = /mob/living/simple_animal/pet/dog/corgi/Lisa
 	..()
 
 /obj/structure/closet/critter/cow
@@ -79,7 +79,7 @@
 
 /obj/structure/closet/critter/fox
 	name = "fox crate"
-	content_mob = /mob/living/simple_animal/pet/fox
+	content_mob = /mob/living/simple_animal/pet/dog/fox
 
 /obj/structure/closet/critter/butterfly
 	name = "butterflies crate"

code/game/objects/structures/crates_lockers/largecrate.dm

@@ -55,7 +55,7 @@
 
 /obj/structure/largecrate/lisa/attackby(obj/item/W as obj, mob/user as mob)	//ugly but oh well
 	if(istype(W, /obj/item/crowbar))
-		new /mob/living/simple_animal/pet/corgi/Lisa(loc)
+		new /mob/living/simple_animal/pet/dog/corgi/Lisa(loc)
 	..()
 
 /obj/structure/largecrate/cow