cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

turning removes pacifism

Browse Source
This commit is contained in:
qweq12yt
2021-02-27 01:49:56 -03:00
parent d02b713b46
commit 04d478bb20
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_onclick/item_attack.dm
View File

@@ -82,7 +82,7 @@
SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, M, user) SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, M, user)
if(item_flags & NOBLUDGEON) if(item_flags & NOBLUDGEON)
return return
if(force && damtype != STAMINA && HAS_TRAIT(user, TRAIT_PACIFISM) && !is_species(user, /datum/species/zombie/infectious)) if(force && damtype != STAMINA && HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, "<span class='warning'>You don't want to harm other living beings!</span>") to_chat(user, "<span class='warning'>You don't want to harm other living beings!</span>")
return return

2
code/modules/mob/living/carbon/human/species.dm
View File

@@ -78,6 +78,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
var/list/species_traits = list(HAS_FLESH,HAS_BONE) //by default they can scar and have bones/flesh unless set to something else var/list/species_traits = list(HAS_FLESH,HAS_BONE) //by default they can scar and have bones/flesh unless set to something else
// generic traits tied to having the species // generic traits tied to having the species
var/list/inherent_traits = list() var/list/inherent_traits = list()
// blacklisted traits that conflict with species. If i can figure how to use these lists and mass removes, will uncomment
//var/list/blacklisted_traits = list()
var/inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID var/inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID
var/attack_verb = "punch" // punch-specific attack verb var/attack_verb = "punch" // punch-specific attack verb

6
code/modules/mob/living/carbon/human/species_types/zombies.dm
View File

@@ -37,6 +37,8 @@
armor = 20 // 120 damage to KO a zombie, which kills it armor = 20 // 120 damage to KO a zombie, which kills it
speedmod = 1.6 // they're very slow speedmod = 1.6 // they're very slow
mutanteyes = /obj/item/organ/eyes/night_vision/zombie mutanteyes = /obj/item/organ/eyes/night_vision/zombie
// same as in species.dm
//blacklisted_traits = list(TRAIT_PACIFISM)
var/heal_rate = 1 var/heal_rate = 1
var/regen_cooldown = 0 var/regen_cooldown = 0
@@ -96,6 +98,10 @@
part.incoming_stam_mult = incoming_stam_mult part.incoming_stam_mult = incoming_stam_mult
//todo: add negative wound resistance to all parts when wounds is merged (zombies are physically weak in terms of limbs) //todo: add negative wound resistance to all parts when wounds is merged (zombies are physically weak in terms of limbs)
// this removes pacifism quirk so our zombie can attack normally. but how to add back when cured?
REMOVE_TRAIT(C, TRAIT_PACIFISM, ROUNDSTART_TRAIT) // and why "cannot be removed without admin intervention"? what does that mean?
// Your skin falls off // Your skin falls off
/datum/species/krokodil_addict /datum/species/krokodil_addict
name = SPECIES_HUMAN name = SPECIES_HUMAN