[MIRROR] Fully removes devil and affiliated shitcode (#922)

* Fully removes devil and affiliated shitcode (#53612)

Its all over the place, messy, and overall a bad enough gamemode to be removed from rotation.
A rework would have to tear out everything as is so there is no reason to allow the shitcode to live beyond tripping up everything.

* Fully removes devil and affiliated shitcode

* weh

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
This commit is contained in:
SkyratBot
2020-09-23 10:00:29 +01:00
committed by GitHub
co-authored by TiviPlus Azarak
parent 5db797b9a3
commit 7979f4d1b0
85 changed files with 128 additions and 2965 deletions
+1 -1
View File
@@ -503,7 +503,7 @@
//SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION
//Consider moving this to a new species proc "spec_heal" maybe?
if(owner.stat == DEAD && owner?.dna?.species && (REVIVES_BY_HEALING in owner.dna.species.species_traits))
if(owner.health > 50 && !owner.hellbound)
if(owner.health > 50)
owner.revive(FALSE)
//SKYRAT EDIT ADDITION END
cremation_progress = min(0, cremation_progress - ((brute_dam + burn_dam)*(100/max_damage)))
-5
View File
@@ -263,11 +263,6 @@
max_damage = 500
animal_origin = ALIEN_BODYPART
/obj/item/bodypart/head/devil
dismemberable = 0
max_damage = 5000
animal_origin = DEVIL_BODYPART
/obj/item/bodypart/head/larva
icon = 'icons/mob/animal_parts.dmi'
icon_state = "larva_head"
-29
View File
@@ -41,11 +41,6 @@
max_damage = 500
animal_origin = ALIEN_BODYPART
/obj/item/bodypart/chest/devil
dismemberable = 0
max_damage = 5000
animal_origin = DEVIL_BODYPART
/obj/item/bodypart/chest/larva
icon = 'icons/mob/animal_parts.dmi'
icon_state = "larva_chest"
@@ -151,12 +146,6 @@
max_damage = 100
animal_origin = ALIEN_BODYPART
/obj/item/bodypart/l_arm/devil
dismemberable = FALSE
can_be_disabled = FALSE
max_damage = 5000
animal_origin = DEVIL_BODYPART
/obj/item/bodypart/r_arm
name = "right arm"
desc = "Over 87% of humans are right handed. That figure is much lower \
@@ -253,12 +242,6 @@
max_damage = 100
animal_origin = ALIEN_BODYPART
/obj/item/bodypart/r_arm/devil
dismemberable = FALSE
can_be_disabled = FALSE
max_damage = 5000
animal_origin = DEVIL_BODYPART
/obj/item/bodypart/l_leg
name = "left leg"
desc = "Some athletes prefer to tie their left shoelaces first for good \
@@ -348,12 +331,6 @@
max_damage = 100
animal_origin = ALIEN_BODYPART
/obj/item/bodypart/l_leg/devil
dismemberable = FALSE
can_be_disabled = FALSE
max_damage = 5000
animal_origin = DEVIL_BODYPART
/obj/item/bodypart/r_leg
name = "right leg"
desc = "You put your right leg in, your right leg out. In, out, in, out, \
@@ -444,9 +421,3 @@
can_be_disabled = FALSE
max_damage = 100
animal_origin = ALIEN_BODYPART
/obj/item/bodypart/r_leg/devil
dismemberable = FALSE
can_be_disabled = FALSE
max_damage = 5000
animal_origin = DEVIL_BODYPART
+2 -16
View File
@@ -180,15 +180,7 @@
for(var/V in listeners)
var/mob/living/L = V
var/datum/antagonist/devil/devilinfo = is_devil(L)
if(devilinfo && findtext(message, devilinfo.truename))
var/start = findtext(message, devilinfo.truename)
listeners = list(L) //Devil names are unique.
power_multiplier *= 5 //if you're a devil and god himself addressed you, you fucked up
//Cut out the name so it doesn't trigger commands
message = copytext(message, 1, start) + copytext(message, start + length(devilinfo.truename))
break
else if(findtext(message, L.real_name, 1, length(L.real_name) + 1))
if(findtext(message, L.real_name, 1, length(L.real_name) + 1))
specific_listeners += L //focus on those with the specified name
//Cut out the name so it doesn't trigger commands
found_string = L.real_name
@@ -363,13 +355,7 @@
cooldown = COOLDOWN_MEME
for(var/V in listeners)
var/mob/living/L = V
var/text = ""
if(is_devil(L))
var/datum/antagonist/devil/devilinfo = is_devil(L)
text = devilinfo.truename
else
text = L.real_name
addtimer(CALLBACK(L, /atom/movable/proc/say, text), 5 * i)
addtimer(CALLBACK(L, /atom/movable/proc/say, L.real_name), 5 * i)
i++
//SAY MY NAME
+1 -1
View File
@@ -18,7 +18,7 @@
return FALSE
if(target.stat != DEAD)
return FALSE
if(target.suiciding || target.hellbound || HAS_TRAIT(target, TRAIT_HUSK))
if(target.suiciding || HAS_TRAIT(target, TRAIT_HUSK))
return FALSE
var/obj/item/organ/brain/B = target.getorganslot(ORGAN_SLOT_BRAIN)
if(!B)