shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reviewer and linter fixes, and veil tweak

Browse Source
This commit is contained in:
Artur
2019-12-14 17:09:39 +02:00
parent 9faf3d1dac
commit d0493ac471
8 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/bloodsucker/bloodsucker_integration.dm
+2 -2
View File
@@ -117,14 +117,14 @@
// Normal Creatures:
if(!mind || !mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER))
return blood_volume < BLOOD_VOLUME_SAFE
return blood_volume < (BLOOD_VOLUME_SAFE * blood_ratio)
var/datum/antagonist/bloodsucker/bloodsuckerdatum = mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
if(bloodsuckerdatum.poweron_masquerade)
return FALSE
// If a Bloodsucker is malnourished, AND if his temperature matches his surroundings (aka he hasn't fed recently and looks COLD)...
return blood_volume < BLOOD_VOLUME_OKAY // && !(bodytemperature <= get_temperature() + 2)
return blood_volume < (BLOOD_VOLUME_OKAY * blood_ratio) // && !(bodytemperature <= get_temperature() + 2)
/mob/living/carbon/human/ShowAsPaleExamine()
// Check for albino, as per human/examine.dm's check.
code/modules/antagonists/bloodsucker/bloodsucker_powers.dm
+9 -9
View File
@@ -128,7 +128,7 @@
/datum/action/bloodsucker/proc/CheckCanDeactivate(display_error)
return TRUE
/datum/action/bloodsucker/UpdateButtonIcon()
/datum/action/bloodsucker/UpdateButtonIcon(force = FALSE)
background_icon_state = active? background_icon_state_on : background_icon_state_off
..()//UpdateButtonIcon()
@@ -197,28 +197,28 @@
// Click power: Begin Aim
/datum/action/bloodsucker/targeted/Trigger()
if (active && CheckCanDeactivate(TRUE))
if(active && CheckCanDeactivate(TRUE))
DeactivateRangedAbility()
DeactivatePower()
return
if (!CheckCanPayCost(TRUE) || !CheckCanUse(TRUE))
if(!CheckCanPayCost(TRUE) || !CheckCanUse(TRUE))
return
active = !active
UpdateButtonIcon()
// Create & Link Targeting Proc
var/mob/living/L = owner
if (L.ranged_ability)
if(L.ranged_ability)
L.ranged_ability.remove_ranged_ability()
bs_proc_holder.add_ranged_ability(L)
if (message_Trigger != "")
if(message_Trigger != "")
to_chat(owner, "<span class='announce'>[message_Trigger]</span>")
/datum/action/bloodsucker/targeted/CheckCanUse(display_error)
. = ..()
if(!.)
return
if (!owner.client) // <--- We don't allow non client usage so that using powers like mesmerize will FAIL if you try to use them as ghost. Why? because ranged_abvility in spell.dm
if(!owner.client) // <--- We don't allow non client usage so that using powers like mesmerize will FAIL if you try to use them as ghost. Why? because ranged_abvility in spell.dm
return FALSE // doesn't let you remove powers if you're not there. So, let's just cancel the power entirely.
return TRUE
@@ -247,13 +247,13 @@
// Click Target
/datum/action/bloodsucker/targeted/proc/ClickWithPower(atom/A)
// CANCEL RANGED TARGET check
if (power_in_use || !CheckValidTarget(A))
if(power_in_use || !CheckValidTarget(A))
return FALSE
// Valid? (return true means DON'T cancel power!)
if (!CheckCanPayCost(TRUE) || !CheckCanUse(TRUE) || !CheckCanTarget(A, TRUE))
if(!CheckCanPayCost(TRUE) || !CheckCanUse(TRUE) || !CheckCanTarget(A, TRUE))
return TRUE
// Skip this part so we can return TRUE right away.
if (power_activates_immediately)
if(power_activates_immediately)
PowerActivatedSuccessfully() // Mesmerize pays only after success.
power_in_use = TRUE // Lock us into this ability until it successfully fires off. Otherwise, we pay the blood even if we fail.
FireTargetedPower(A) // We use this instead of ActivatePower(), which has no input
code/modules/antagonists/bloodsucker/datum_bloodsucker.dm
+4 -3
View File
@@ -103,7 +103,7 @@
"Sveyn","Aurel","Alexe","Iustin","Theodor","Dimitrie","Octav","Damien","Magnus","Caine","Abel", // Romanian/Ancient
"Lucius","Gaius","Otho","Balbinus","Arcadius","Romanos","Alexios","Vitellius", // Latin
"Melanthus","Teuthras","Orchamus","Amyntor","Axion", // Greek
"Thoth","Thutmose","Osorkon,","Nofret","Minmotu","Khafra" // Egyptian
"Thoth","Thutmose","Osorkon,","Nofret","Minmotu","Khafra", // Egyptian
"Dio")
else
@@ -113,7 +113,7 @@
"Alcestis","Damaris","Elisavet","Khthonia","Teodora", // Greek
"Nefret","Ankhesenpep") // Egyptian
/datum/antagonist/bloodsucker/proc/SelectTitle(am_fledgling = 0, forced=FALSE)
/datum/antagonist/bloodsucker/proc/SelectTitle(am_fledgling = 0, forced = FALSE)
// Already have Title
if (!forced && vamptitle != null)
return
@@ -181,6 +181,7 @@
// Powers
BuyPower(new /datum/action/bloodsucker/feed)
BuyPower(new /datum/action/bloodsucker/masquerade)
BuyPower(new /datum/action/bloodsucker/veil)
// Traits
for (var/T in defaultTraits)
ADD_TRAIT(owner.current, T, "bloodsucker")
@@ -334,7 +335,7 @@ datum/antagonist/bloodsucker/proc/SpendRank()
// Assign True Reputation
if(vamplevel == 4)
SelectReputation(am_fledgling=FALSE, forced=TRUE)
SelectReputation(am_fledgling = FALSE, forced = TRUE)
to_chat(owner.current, "<span class='notice'>You are now a rank [vamplevel] Bloodsucker. Your strength, resistence, health, feed rate, regen rate, and maximum blood have all increased!</span>")
to_chat(owner.current, "<span class='notice'>Your existing powers have all ranked up as well!</span>")
update_hud(TRUE)
code/modules/antagonists/bloodsucker/datum_vassal.dm
+1 -2
View File
@@ -62,9 +62,8 @@
flash_protect = -1 //These eyes are weaker to flashes, but let you see in the dark
/datum/antagonist/vassal/proc/remove_thrall_eyes()
// Eyes
var/obj/item/organ/eyes/E = new
E.Insert(owner.current)
E.Insert(owner.current)
/datum/antagonist/vassal/on_removal()
SSticker.mode.vassals -= owner // Add if not already in here (and you might be, if you were picked at round start)
code/modules/antagonists/bloodsucker/items/bloodsucker_organs.dm
+3 -8
View File
@@ -20,16 +20,11 @@
/datum/antagonist/bloodsucker/proc/RemoveVampOrgans()
// Heart
var/obj/item/organ/heart/H = new
H.Insert(owner.current)
H.Insert(owner.current)
// Eyes
var/obj/item/organ/eyes/E = new
E.Insert(owner.current)
E.Insert(owner.current)
// HEART: OVERWRITE //
/obj/item/organ/heart/proc/HeartStrengthMessage()
if (beating)
return "a healthy"
return "<span class='danger'>an unstable</span>"
// HEART //
/obj/item/organ/heart/vampheart
beating = 0
@@ -51,7 +46,7 @@
fakingit = 1 // We're pretending to beat, to fool people.
/obj/item/organ/heart/vampheart/HeartStrengthMessage()
if (fakingit)
if(fakingit)
return "a healthy"
return "<span class='danger'>no</span>" // Bloodsuckers don't have a heartbeat at all when stopped (default is "an unstable")
// EYES //
code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm
+2 -2
View File
@@ -196,7 +196,7 @@
..()
unbuckle_mob(M)
/obj/structure/bloodsucker/vassalrack/unbuckle_mob(mob/living/buckled_mob)//, force=FALSE)
/obj/structure/bloodsucker/vassalrack/unbuckle_mob(mob/living/buckled_mob, force = FALSE)
if(!..())
return
var/matrix/m180 = matrix(buckled_mob.transform)
@@ -388,7 +388,7 @@
/* if(HAS_TRAIT(target, TRAIT_MINDSHIELD))
alert_text += "\n\nYou will no longer be loyal to the station!"
if(SSticker.mode.AmValidAntag(target.mind)) */
alert_text += "\n\nYou will not lose your current objectives, but they come second to the will of your new master!"
alert_text += "\n\nYou will not lose your current objectives, but they come second to the will of your new master!"
switch(alert(target, alert_text,"THE HORRIBLE PAIN! WHEN WILL IT END?!","Yes, Master!", "NEVER!"))
if("Yes, Master!")
disloyalty_accept(target)
code/modules/antagonists/bloodsucker/powers/bs_veil.dm
-5
View File
@@ -1,8 +1,4 @@
/datum/action/bloodsucker/veil
name = "Veil of Many Faces"
desc = "Disguise yourself in the illusion of another identity."
@@ -169,7 +165,6 @@
/obj/effect/particle_effect/smoke/vampsmoke
opaque = FALSE
amount = 0
lifetime = 0
/obj/effect/particle_effect/smoke/vampsmoke/fade_out(frames = 6)
..(frames)
code/modules/surgery/organs/heart.dm
+5
View File
@@ -55,6 +55,11 @@
update_icon()
return 1
/obj/item/organ/heart/proc/HeartStrengthMessage()
if(beating)
return "a healthy"
return "<span class='danger'>an unstable</span>"
/obj/item/organ/heart/prepare_eat()
var/obj/S = ..()
S.icon_state = "[icon_base]-off"