фиксы мое

ss220-space · Sep 22, 2024 · cc53fa0 · cc53fa0
1 parent c1affa1
commit cc53fa0
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/code/__DEFINES/traits/sources.dm b/code/__DEFINES/traits/sources.dm
@@ -150,3 +150,5 @@
 #define EVIL_FAX_TRAIT "evil_fax"
 #define CORGI_HARDSUIT_TRAIT "corgi_hardsuit"
 
+
+#define HULK_TRAIT "hulk_trait"
diff --git a/code/datums/spells/shapeshift.dm b/code/datums/spells/shapeshift.dm
@@ -50,7 +50,7 @@
 
 /obj/effect/proc_holder/spell/shapeshift/proc/Shapeshift(mob/living/caster)
 	for(var/mob/living/mob in caster)
-		if(HAS_TRAIT(mob, TRAIT_GODMODE))
+		if(HAS_TRAIT_FROM(mob, TRAIT_GODMODE, UNIQUE_TRAIT_SOURCE(src)))
 			to_chat(caster, span_warning("You're already shapeshifted!"))
 			return
 

diff --git a/code/game/objects/items/weapons/anomaly_extract.dm b/code/game/objects/items/weapons/anomaly_extract.dm
@@ -124,7 +124,6 @@
 	original_body = user
 	ADD_TRAIT(original_body, TRAIT_NO_TRANSFORM, UNIQUE_TRAIT_SOURCE(src))
 	slimeme.add_traits(list(TRAIT_NO_TRANSFORM, TRAIT_GODMODE), UNIQUE_TRAIT_SOURCE(src))
-	ADD_TRAIT(user, TRAIT_GODMODE, UNIQUE_TRAIT_SOURCE(src))
 	user.mind.transfer_to(slimeme)
 	slimeme.update_sight()
 	user.move_to_null_space()

diff --git a/code/modules/antagonists/vampire/vampire_powers/bestia_powers.dm b/code/modules/antagonists/vampire/vampire_powers/bestia_powers.dm
@@ -1010,7 +1010,7 @@
 
 	vampire.stop_sucking()
 	original_body = user
-	user.add_traits(list(TRAIT_NO_TRANSFORM, TRAIT_GODMODE), UNIQUE_TRAIT_SOURCE(src))
+	original_body.add_traits(list(TRAIT_NO_TRANSFORM, TRAIT_GODMODE), UNIQUE_TRAIT_SOURCE(src))
 	vampire_animal.add_traits(list(TRAIT_NO_TRANSFORM, TRAIT_GODMODE), UNIQUE_TRAIT_SOURCE(src))
 	user.forceMove(vampire_animal)
 	user.mind.transfer_to(vampire_animal)

diff --git a/code/modules/mob/living/simple_animal/hulk.dm b/code/modules/mob/living/simple_animal/hulk.dm
@@ -153,7 +153,7 @@
 
 	for(var/mob/mob in contents)
 		mob.forceMove(loc)
-		REMOVE_TRAIT(mob, TRAIT_GODMODE, UNIQUE_TRAIT_SOURCE(src))
+		REMOVE_TRAIT(mob, TRAIT_GODMODE, HULK_TRAIT)
 		if(isliving(mob))
 			var/mob/living/living = mob
 			living.Paralyse(30 SECONDS)

diff --git a/code/modules/mob/living/simple_animal/hulk_power.dm b/code/modules/mob/living/simple_animal/hulk_power.dm
@@ -40,7 +40,7 @@
 	playsound(user, 'sound/effects/bamf.ogg', CHANNEL_BUZZ)
 	Monster.original_body = user
 	user.forceMove(Monster)
-	ADD_TRAIT(user, TRAIT_GODMODE, UNIQUE_TRAIT_SOURCE(src))
+	ADD_TRAIT(user, TRAIT_GODMODE, HULK_TRAIT)
 	user.mind.transfer_to(Monster)
 	Monster.say(pick("RAAAAAAAARGH!", "HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", "AAAAAAARRRGH!" ))
 

diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
@@ -148,10 +148,11 @@
 		qdel(src)
 
 /obj/singularity/energy_ball/proc/dust_mobs(atom/atom)
-	if(isliving(atom))
-		var/mob/living/living = atom
-		if(living.incorporeal_move || HAS_TRAIT(living, TRAIT_GODMODE))
-			return
+	if(!isliving(atom))
+		return
+	var/mob/living/living = atom
+	if(living.incorporeal_move || HAS_TRAIT(living, TRAIT_GODMODE))
+		return
 	if(!iscarbon(atom))
 		return
 	for(var/obj/machinery/power/grounding_rod/rod in orange(src, 2))