Revert "Gargoyles (WorldOfDarknessXIII#218)" (WorldOfDarknessXIII#219)

This reverts commit 2396f12.
Discozavisim · Nov 18, 2024 · 8557071 · 8557071
1 parent 2396f12
commit 8557071
Show file tree

Hide file tree

Showing 19 changed files with 39 additions and 227 deletions.
diff --git a/code/game/objects/structures/petrified_statue.dm b/code/game/objects/structures/petrified_statue.dm
@@ -77,31 +77,14 @@
 
 /mob/proc/petrify(statue_timer)
 
-/mob/living/carbon/human/petrify(statue_timer, clane_type)
+/mob/living/carbon/human/petrify(statue_timer)
 	if(!isturf(loc))
 		return FALSE
 	if(iskindred(src))
-		if(clane_type)
-			if(clane_type == "Serpentis")
-				ADD_TRAIT(src, TRAIT_NOBLEED, MAGIC_TRAIT)
-				var/obj/structure/statue/petrified/S = new(loc, src, statue_timer)
-				S.name = "[name]'s mummy"
-				S.icon_state = "mummy"
-				S.desc = "CURSE OF RA 𓀀 𓀁 𓀂 𓀃 𓀄 𓀅 𓀆 𓀇 𓀈 𓀉 𓀊 𓀋 𓀌 𓀍 𓀎 𓀏 𓀐 𓀑 𓀒 𓀓 𓀔 𓀕 𓀖 𓀗 𓀘 𓀙 𓀚 𓀛 𓀜 𓀝 𓀞 𓀟 𓀠 𓀡 𓀢 𓀣 𓀤 𓀥 𓀦 𓀧 𓀨 𓀩 𓀪 𓀫 𓀬 𓀭 𓀮 𓀯 𓀰 𓀱 𓀲 𓀳 𓀴 𓀵 𓀶 𓀷 𓀸 𓀹 𓀺 𓀻 𓀼 𓀽 𓀾 𓀿 𓁀 𓁁 𓁂 𓁃 𓁄 𓁅 𓁆 𓁇 𓁈 𓁉 𓁊 𓁋 𓁌 𓁍 𓁎 𓁏 𓁐 𓁑 𓀄 𓀅 𓀆."
-			if(clane_type == "Visceratika")
-				ADD_TRAIT(src, TRAIT_NOBLEED, MAGIC_TRAIT)
-				var/obj/structure/statue/petrified/S = new(loc, src, statue_timer)
-				S.name = "statue"
-				S.icon = 'code/modules/wod13/64x64.dmi'
-				S.icon_state = "angelstatue"
-				S.desc = "Some gothic statue."
-		else
-			var/obj/structure/statue/petrified/S = new(loc, src, statue_timer)
-			S.name = "statue of [name]"
-			ADD_TRAIT(src, TRAIT_NOBLEED, MAGIC_TRAIT)
-			S.copy_overlays(src)
-			var/newcolor = list(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
-			S.add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY)
+		var/obj/structure/statue/petrified/S = new(loc, src, statue_timer)
+		S.name = "[name]'s mummy"
+		S.icon_state = "mummy"
+		S.desc = "CURSE OF RA 𓀀 𓀁 𓀂 𓀃 𓀄 𓀅 𓀆 𓀇 𓀈 𓀉 𓀊 𓀋 𓀌 𓀍 𓀎 𓀏 𓀐 𓀑 𓀒 𓀓 𓀔 𓀕 𓀖 𓀗 𓀘 𓀙 𓀚 𓀛 𓀜 𓀝 𓀞 𓀟 𓀠 𓀡 𓀢 𓀣 𓀤 𓀥 𓀦 𓀧 𓀨 𓀩 𓀪 𓀫 𓀬 𓀭 𓀮 𓀯 𓀰 𓀱 𓀲 𓀳 𓀴 𓀵 𓀶 𓀷 𓀸 𓀹 𓀺 𓀻 𓀼 𓀽 𓀾 𓀿 𓁀 𓁁 𓁂 𓁃 𓁄 𓁅 𓁆 𓁇 𓁈 𓁉 𓁊 𓁋 𓁌 𓁍 𓁎 𓁏 𓁐 𓁑 𓀄 𓀅 𓀆."
 	else
 		var/obj/structure/statue/petrified/S = new(loc, src, statue_timer)
 		S.name = "statue of [name]"

diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
@@ -212,8 +212,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/werewolf_name
 	var/auspice_level = 1
 
-	var/clane_accessory
-
 /datum/preferences/proc/add_experience(var/amount)
 	if(amount)
 		true_experience = true_experience+amount
@@ -651,14 +649,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				dat += "<b>Clane/Bloodline:</b> <a href='?_src_=prefs;preference=clane;task=input'>[clane.name]</a><BR>"
 				dat += "<b>Description:</b> [clane.desc]<BR>"
 				dat += "<b>Curse:</b> [clane.curse]<BR>"
-				if(length(clane.accessories))
-					if(clane_accessory in clane.accessories)
-						dat += "<b>Marks:</b> <a href='?_src_=prefs;preference=clane_acc;task=input'>[clane_accessory]</a><BR>"
-					else
-						clane_accessory = pick(clane.accessories)
-						dat += "<b>Marks:</b> <a href='?_src_=prefs;preference=clane_acc;task=input'>[clane_accessory]</a><BR>"
-				else
-					clane_accessory = null
 				dat += "<h2>[make_font_cool("DISCIPLINES")]</h2>"
 
 //				else
@@ -2128,17 +2118,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						var/datum/auspice/Auspic = new newtype()
 						auspice = Auspic
 
-				if("clane_acc")
-					if(slotlocked)
-						link_bug_fix = FALSE
-						return
-					if(!length(clane.accessories))
-						clane_accessory = null
-						return
-					var/result = input(user, "Select a mark", "Marks") as null|anything in clane.accessories
-					if(result)
-						clane_accessory = result
-
 				if("clane")
 					if(slotlocked)
 						link_bug_fix = FALSE
@@ -2205,8 +2184,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 							hairstyle = "Bald"
 						if(clane.no_facial)
 							facial_hairstyle = "Shaved"
-						if(length(clane.accessories))
-							clane_accessory = pick(clane.accessories)
 //						real_name = clane.random_name(gender)		//potom sdelat
 				if("auspice_level")
 					if(true_experience >= auspice_level*10 && auspice_level < 3)
@@ -3120,7 +3097,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	if(pref_species.name == "Vampire")
 		var/datum/vampireclane/CLN = new clane.type()
 		character.clane = CLN
-		character.clane.current_accessory = clane_accessory
 		character.maxbloodpool = 10+((13-generation)*3)
 		character.bloodpool = rand(2, character.maxbloodpool)
 		character.generation = generation
@@ -3129,7 +3105,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 //			character.maxHealth = initial(character.maxHealth)+50*(13-generation)
 //			character.health = initial(character.health)+50*(13-generation)
 	else
-		character.clane.current_accessory = null
 		character.clane = null
 		character.generation = 13
 		character.bloodpool = character.maxbloodpool

diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
@@ -436,7 +436,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	READ_FILE(S["backpack"], backpack)
 	READ_FILE(S["jumpsuit_style"], jumpsuit_style)
 	READ_FILE(S["uplink_loc"], uplink_spawn_loc)
-	READ_FILE(S["clane_accessory"], clane_accessory)
 	READ_FILE(S["playtime_reward_cloak"], playtime_reward_cloak)
 	READ_FILE(S["phobia"], phobia)
 	READ_FILE(S["randomise"],  randomise)
@@ -584,7 +583,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	backpack			= sanitize_inlist(backpack, GLOB.backpacklist, initial(backpack))
 	jumpsuit_style	= sanitize_inlist(jumpsuit_style, GLOB.jumpsuitlist, initial(jumpsuit_style))
 	uplink_spawn_loc = sanitize_inlist(uplink_spawn_loc, GLOB.uplink_spawn_loc_list, initial(uplink_spawn_loc))
-	clane_accessory = sanitize_inlist(clane_accessory, clane.accessories, null)
 	playtime_reward_cloak = sanitize_integer(playtime_reward_cloak)
 	features["mcolor"]	= sanitize_hexcolor(features["mcolor"], 3, 0)
 	features["ethcolor"]	= copytext_char(features["ethcolor"], 1, 7)
@@ -692,7 +690,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["backpack"]			, backpack)
 	WRITE_FILE(S["jumpsuit_style"]			, jumpsuit_style)
 	WRITE_FILE(S["uplink_loc"]			, uplink_spawn_loc)
-	WRITE_FILE(S["clane_accessory"]			, clane_accessory)
 	WRITE_FILE(S["playtime_reward_cloak"]			, playtime_reward_cloak)
 	WRITE_FILE(S["randomise"]		, randomise)
 	WRITE_FILE(S["species"]			, pref_species.id)

diff --git a/code/modules/mob/dead/new_player/sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories.dm
@@ -1728,21 +1728,6 @@
 	center = TRUE
 	dimension_y = 32
 
-/datum/sprite_accessory/wings/gargoyle
-	name = "Gargoyle"
-	icon_state = "gargoyle"
-	dimension_x = 96
-	center = TRUE
-	dimension_y = 32
-	locked = TRUE
-
-/datum/sprite_accessory/wings_open/gargoyle
-	name = "Gargoyle"
-	icon_state = "gargoyle"
-	dimension_x = 96
-	center = TRUE
-	dimension_y = 32
-
 /datum/sprite_accessory/wings/megamoth
 	name = "Megamoth"
 	icon_state = "megamoth"

diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
@@ -270,6 +270,3 @@
 	var/istower = FALSE
 
 	var/total_contracted = 0
-
-	///Allows Gargoyles to move through solid objects using Visceratika 5.
-	var/gargoyle_pass = FALSE
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
@@ -142,19 +142,15 @@
 	var/list/mob/living/listeners = list()
 	for(var/mob/living/L in get_hearers_in_view(8, user))
 		if(L.can_hear() && !L.anti_magic_check(FALSE, TRUE) && L.stat != DEAD)
-			var/dominate_me = FALSE
 			if(L == user && !include_speaker)
 				continue
 			if(ishuman(L))
 				var/mob/living/carbon/human/H = L
-				if(H.clane)
-					if(H.clane.name == "Gargoyle")
-						dominate_me = TRUE
 				if(istype(H.ears, /obj/item/clothing/ears/earmuffs))
 					continue
-			if(user.generation > L.generation && !dominate_me) //Dominate can't be used on lower Generations
+			if(user.generation > L.generation) //Dominate can't be used on lower Generations
 				continue
-			if(((user.social + user.additional_social) <= (L.mentality + L.additional_mentality)) && !dominate_me) //Dominate must defeat resistance
+			if((user.social + user.additional_social) <= (L.mentality + L.additional_mentality)) //Dominate must defeat resistance
 				continue
 			if(L.resistant_to_disciplines)
 				continue

diff --git a/code/modules/vtmb/disciplines.dm b/code/modules/vtmb/disciplines.dm
@@ -435,13 +435,7 @@
 		return
 	var/mypower = caster.social + caster.additional_social
 	var/theirpower = target.mentality + target.additional_mentality
-	var/dominate_me = FALSE
-	if(ishuman(target))
-		var/mob/living/carbon/human/H = target
-		if(H.clane)
-			if(H.clane.name == "Gargoyle")
-				dominate_me = TRUE
-	if(((theirpower >= mypower) || (caster.generation > target.generation)) && !dominate_me)
+	if((theirpower >= mypower) || (caster.generation > target.generation))
 		to_chat(caster, "<span class='warning'>[target]'s mind is too powerful to dominate!</span>")
 		return
 	if(HAS_TRAIT(caster, TRAIT_MUTE))

diff --git a/code/modules/vtmb/jobs.dm b/code/modules/vtmb/jobs.dm
@@ -222,7 +222,7 @@
 	v_duty = "You are the right hand man or woman of the most powerful vampire in the city. The Camarilla trusts you to run the city, even in their stead."
 	duty = "You are the right hand man or woman of the most powerful vampire in the city. The Camarilla trusts you to run the city, even in their stead."
 	experience_addition = 15
-	allowed_bloodlines = list("Daughters of Cacophony", "Brujah", "Tremere", "Ventrue", "Nosferatu", "Gangrel", "Toreador", "Malkavian", "Banu Haqim", "Giovanni", "Ministry", "Lasombra", "Gargoyle")
+	allowed_bloodlines = list("Daughters of Cacophony", "Brujah", "Tremere", "Ventrue", "Nosferatu", "Gangrel", "Toreador", "Malkavian", "Banu Haqim", "Giovanni", "Ministry", "Lasombra")
 
 /datum/outfit/job/clerk
 	name = "Seneschal"
@@ -277,7 +277,7 @@
 	v_duty = "You are the Prince's enforcer. You report to the sheriff and uphold the Traditions."
 	minimal_masquerade = 4
 	experience_addition = 10
-	allowed_bloodlines = list("Daughters of Cacophony", "Brujah", "Tremere", "Ventrue", "Nosferatu", "Gangrel", "Toreador", "Malkavian", "Banu Haqim", "Giovanni", "Ministry", "Lasombra", "Gargoyle")
+	allowed_bloodlines = list("Daughters of Cacophony", "Brujah", "Tremere", "Ventrue", "Nosferatu", "Gangrel", "Toreador", "Malkavian", "Banu Haqim", "Giovanni", "Ministry", "Lasombra")
 
 /datum/outfit/job/agent
 	name = "Scourge"
@@ -330,7 +330,7 @@
 	v_duty = "A vile curse has gripped the dead of this city. You must keep the graveyard clean and the Masquerade intact."
 	minimal_masquerade = 0
 	experience_addition = 15
-	allowed_bloodlines = list("Daughters of Cacophony", "Salubri", "Baali", "Brujah", "Tremere", "Ventrue", "Nosferatu", "Gangrel", "Toreador", "Malkavian", "Banu Haqim", "Giovanni", "Ministry", "Tzimisce", "Lasombra", "Caitiff", "Gargoyle")
+	allowed_bloodlines = list("Daughters of Cacophony", "Salubri", "Baali", "Brujah", "Tremere", "Ventrue", "Nosferatu", "Gangrel", "Toreador", "Malkavian", "Banu Haqim", "Giovanni", "Ministry", "Tzimisce", "Lasombra", "Caitiff")
 
 /datum/outfit/job/graveyard
 	name = "Graveyard Keeper"
@@ -522,7 +522,7 @@
 	v_duty = "Keep a census of events and provide information to neonates. Listen to the Regent Carefully. Study blood magic and protect the chantry."
 	minimal_masquerade = 3
 	allowed_species = list("Vampire")
-	allowed_bloodlines = list("Tremere", "Gargoyle")
+	allowed_bloodlines = list("Tremere")
 	experience_addition = 15
 
 /datum/outfit/job/archivist
@@ -579,7 +579,7 @@
 	v_duty = "You lead the Anarchs in the City. A Camarilla faction that values freedom and individuality. While not a fan of the traditions, you still respect the Masquerade."
 	minimal_masquerade = 3
 	allowed_species = list("Vampire")
-	allowed_bloodlines = list("Brujah", "Nosferatu", "Gangrel", "Toreador", "Malkavian", "Ventrue", "Lasombra", "Gargoyle")
+	allowed_bloodlines = list("Brujah", "Nosferatu", "Gangrel", "Toreador", "Malkavian", "Ventrue", "Lasombra")
 	experience_addition = 20
 
 /datum/outfit/job/barkeeper
@@ -628,7 +628,7 @@
 
 	display_order = JOB_DISPLAY_ORDER_BOUNCER
 	known_contacts = list("Baron")
-	allowed_bloodlines = list("Daughters of Cacophony", "Brujah", "Nosferatu", "Gangrel", "Toreador", "Malkavian", "Banu Haqim", "Tzimisce", "Caitiff", "Lasombra", "Gargoyle")
+	allowed_bloodlines = list("Daughters of Cacophony", "Brujah", "Nosferatu", "Gangrel", "Toreador", "Malkavian", "Banu Haqim", "Tzimisce", "Caitiff", "Lasombra")
 
 	v_duty = "You work with the baron - whether because of your own ideals or friendship, or other reasons. That doesn't mean you will let someone disregard the one tradition you do agree with - the Masquerade."
 	minimal_masquerade = 2
@@ -681,7 +681,7 @@
 
 	my_contact_is_important = TRUE
 	known_contacts = list("Baron", "Prince", "Sheriff")
-	allowed_bloodlines = list("Brujah", "Nosferatu", "Gangrel", "Toreador", "Malkavian", "Banu Haqim", "Tzimisce", "Caitiff", "Ventrue", "Ministry", "Gargoyle")
+	allowed_bloodlines = list("Brujah", "Nosferatu", "Gangrel", "Toreador", "Malkavian", "Banu Haqim", "Tzimisce", "Caitiff", "Ventrue", "Ministry")
 
 	v_duty = "You provide supplies to other kindred. The warehouse is yours, and it's your business who you'll deal with."
 	minimal_masquerade = 3
@@ -730,7 +730,7 @@
 	bounty_types = CIV_JOB_RANDOM
 	allowed_species = list("Vampire", "Ghoul", "Human")
 	known_contacts = list("Baron", "Prince", "Sheriff")
-	allowed_bloodlines = list("Daughters of Cacophony", "Brujah", "Nosferatu", "Gangrel", "Toreador", "Malkavian", "Banu Haqim", "Tzimisce", "Caitiff", "Lasombra", "Gargoyle")
+	allowed_bloodlines = list("Daughters of Cacophony", "Brujah", "Nosferatu", "Gangrel", "Toreador", "Malkavian", "Banu Haqim", "Tzimisce", "Caitiff", "Lasombra")
 
 	v_duty = "You work for the Dealer, or are a part of their coterie. They pay well and the job is easy. Don't disappoint them."
 	duty = "Though your boss is odd and only works late night hours, they pay you well enough that you avoid questioning it."
@@ -783,7 +783,7 @@
 	v_duty = "Follow the traditions of the Camarilla. Obey the Prince and their authority. The city belongs to him. Aligning yourself with your clan members would be of benefit."
 	duty = "Obey the authorities... Or don't. You are up late tonight for one reason or another."
 	minimal_masquerade = 0
-	allowed_bloodlines = list("Daughters of Cacophony", "Salubri", "Baali", "Brujah", "Tremere", "Ventrue", "Nosferatu", "Gangrel", "Toreador", "Malkavian", "Banu Haqim", "Giovanni", "Ministry", "Tzimisce", "Lasombra", "Caitiff", "Old Clan Tzimisce", "Gargoyle")
+	allowed_bloodlines = list("Daughters of Cacophony", "Salubri", "Baali", "Brujah", "Tremere", "Ventrue", "Nosferatu", "Gangrel", "Toreador", "Malkavian", "Banu Haqim", "Giovanni", "Ministry", "Tzimisce", "Lasombra", "Caitiff", "Old Clan Tzimisce")
 
 /datum/outfit/job/citizen
 	name = "Citizen"
@@ -1580,7 +1580,7 @@
 	duty = "Drive people in the city."
 	minimal_masquerade = 0
 	experience_addition = 10
-	allowed_bloodlines = list("Daughters of Cacophony", "Salubri", "Baali", "Brujah", "Tremere", "Ventrue", "Nosferatu", "Gangrel", "Toreador", "Malkavian", "Banu Haqim", "Giovanni", "Ministry", "Tzimisce", "Lasombra", "Caitiff", "Gargoyle")
+	allowed_bloodlines = list("Daughters of Cacophony", "Salubri", "Baali", "Brujah", "Tremere", "Ventrue", "Nosferatu", "Gangrel", "Toreador", "Malkavian", "Banu Haqim", "Giovanni", "Ministry", "Tzimisce", "Lasombra", "Caitiff")
 
 /datum/job/vamp/taxi/after_spawn(mob/living/H, mob/M, latejoin = FALSE)
 	..()

diff --git a/code/modules/vtmb/pyramid.dm b/code/modules/vtmb/pyramid.dm
@@ -326,27 +326,28 @@
 	for(var/mob/living/carbon/human/H in loc)
 		if(H)
 			if(H.stat > 1)
-				for(var/datum/action/A in H.actions)
-					if(A)
-						if(A.vampiric)
-							A.Remove(H)
-				H.set_species(/datum/species/kindred)
-				H.clane = new /datum/vampireclane/gargoyle()
-				H.clane.on_gain(H)
-				H.clane.post_gain(H)
-				H.create_disciplines(FALSE, /datum/discipline/potence, /datum/discipline/fortitude, /datum/discipline/visceratika)
-				if(!H.key)
+				if(H.key)
+					var/mob/living/simple_animal/hostile/gargoyle/Y = new(loc)
+					Y.key = H.key
+					Y.my_creator = last_activator
+					qdel(H)
+					playsound(loc, 'code/modules/wod13/sounds/thaum.ogg', 50, FALSE)
+					qdel(src)
+					return
+				else
 					var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you wish to play as Sentient Gargoyle?", null, null, null, 50, src)
 					for(var/mob/dead/observer/G in GLOB.player_list)
 						if(G.key)
 							to_chat(G, "<span class='ghostalert'>Gargoyle Transformation rune has been triggered.</span>")
 					if(LAZYLEN(candidates))
 						var/mob/dead/observer/C = pick(candidates)
-						H.key = C.key
-//					Y.key = C.key
-//					Y.my_creator = last_activator
-				playsound(loc, 'code/modules/wod13/sounds/thaum.ogg', 50, FALSE)
-				qdel(src)
+						var/mob/living/simple_animal/hostile/gargoyle/Y = new(loc)
+						Y.key = C.key
+						Y.my_creator = last_activator
+						qdel(H)
+						playsound(loc, 'code/modules/wod13/sounds/thaum.ogg', 50, FALSE)
+						qdel(src)
+						return
 				return
 			else
 				playsound(loc, 'code/modules/wod13/sounds/thaum.ogg', 50, FALSE)

diff --git a/code/modules/vtmb/vampire_clane/clane.dm b/code/modules/vtmb/vampire_clane/clane.dm
@@ -25,18 +25,10 @@ And it also helps for the character set panel
 	var/female_clothes
 	var/enlightement = FALSE
 	var/whitelisted = FALSE
-	var/accessories = list()
-	var/current_accessory
 
 //var/datum/action/innate/drink_blood/sosalka = new
 
 /datum/vampireclane/proc/on_gain(var/mob/living/carbon/human/H)
-	if(length(accessories))
-		if(current_accessory)
-			H.remove_overlay(UNICORN_LAYER)
-			var/mutable_appearance/acc_overlay = mutable_appearance('code/modules/wod13/icons.dmi', current_accessory, -UNICORN_LAYER)
-			H.overlays_standing[UNICORN_LAYER] = acc_overlay
-			H.apply_overlay(UNICORN_LAYER)
 	if(alt_sprite)
 		H.skin_tone = "albino"
 		H.dna.species.limbs_id = alt_sprite