cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Slimes should no longer /list you.

Browse Source
This commit is contained in:
Anewbe
2018-02-20 01:58:49 -06:00
parent c0ca35bb2e
commit 6446328d09
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/gamemodes/technomancer/assistance/golem.dm
View File

@@ -30,7 +30,7 @@
melee_damage_lower = 30 // It has a built in esword. melee_damage_lower = 30 // It has a built in esword.
melee_damage_upper = 30 melee_damage_upper = 30
attack_sound = 'sound/weapons/blade1.ogg' attack_sound = 'sound/weapons/blade1.ogg'
attacktext = "slashed" attacktext = list("slashed")
friendly = "hugs" friendly = "hugs"
resistance = 0 resistance = 0
melee_miss_chance = 0 melee_miss_chance = 0

4
code/modules/blob2/mobs/spore.dm
View File

@@ -12,7 +12,7 @@
melee_damage_lower = 2 melee_damage_lower = 2
melee_damage_upper = 4 melee_damage_upper = 4
layer = MOB_LAYER + 0.2 // Over the blob. layer = MOB_LAYER + 0.2 // Over the blob.
attacktext = "slams into" attacktext = list("slams into")
attack_sound = 'sound/effects/slime_squish.ogg' attack_sound = 'sound/effects/slime_squish.ogg'
emote_see = list("sways", "inflates briefly") emote_see = list("sways", "inflates briefly")
var/mob/living/carbon/human/infested = null // The human this thing is totally not making into a zombie. var/mob/living/carbon/human/infested = null // The human this thing is totally not making into a zombie.
@@ -97,7 +97,7 @@
melee_damage_lower += 8 // 10 total. melee_damage_lower += 8 // 10 total.
melee_damage_upper += 11 // 15 total. melee_damage_upper += 11 // 15 total.
emote_see = list("shambles around", "twitches", "stares") emote_see = list("shambles around", "twitches", "stares")
attacktext = "claws" attacktext = list("claws")
H.forceMove(src) H.forceMove(src)
infested = H infested = H

2
code/modules/mob/living/simple_animal/animals/sif_wildlife/diyaab.dm
View File

@@ -18,7 +18,7 @@
melee_damage_lower = 1 melee_damage_lower = 1
melee_damage_upper = 8 melee_damage_upper = 8
attacktext = "gouged" attacktext = list("gouged")
cold_damage_per_tick = 0 cold_damage_per_tick = 0
speak_chance = 5 speak_chance = 5

2
code/modules/mob/living/simple_animal/animals/sif_wildlife/savik.dm
View File

@@ -17,7 +17,7 @@
melee_damage_lower = 15 melee_damage_lower = 15
melee_damage_upper = 25 melee_damage_upper = 25
attacktext = "mauled" attacktext = list("mauled")
cold_damage_per_tick = 0 cold_damage_per_tick = 0
speak_chance = 5 speak_chance = 5

2
code/modules/mob/living/simple_animal/animals/sif_wildlife/shantak.dm
View File

@@ -17,7 +17,7 @@
melee_damage_lower = 3 melee_damage_lower = 3
melee_damage_upper = 12 melee_damage_upper = 12
attacktext = "gouged" attacktext = list("gouged")
cold_damage_per_tick = 0 cold_damage_per_tick = 0
speak_chance = 5 speak_chance = 5

4
code/modules/mob/living/simple_animal/slime/combat.dm
View File

@@ -180,7 +180,7 @@
var/damage_to_do = rand(melee_damage_lower, melee_damage_upper) var/damage_to_do = rand(melee_damage_lower, melee_damage_upper)
var/armor_modifier = abs((L.getarmor(null, "bio") / 100) - 1) var/armor_modifier = abs((L.getarmor(null, "bio") / 100) - 1)
L.attack_generic(src, damage_to_do, attacktext) L.attack_generic(src, damage_to_do, pick(attacktext))
playsound(src, 'sound/weapons/bite.ogg', 75, 1) playsound(src, 'sound/weapons/bite.ogg', 75, 1)
// Give the slime some nutrition, if applicable. // Give the slime some nutrition, if applicable.
@@ -199,7 +199,7 @@
if(istype(L,/obj/mecha)) if(istype(L,/obj/mecha))
var/obj/mecha/M = L var/obj/mecha/M = L
M.attack_generic(src, rand(melee_damage_lower, melee_damage_upper), attacktext) M.attack_generic(src, rand(melee_damage_lower, melee_damage_upper), pick(attacktext))
/mob/living/simple_animal/slime/proc/post_attack(var/mob/living/L, var/intent = I_HURT) /mob/living/simple_animal/slime/proc/post_attack(var/mob/living/L, var/intent = I_HURT)
if(intent != I_HELP) if(intent != I_HELP)

2
code/modules/xenobio2/mob/slime/slime.dm
View File

@@ -22,7 +22,7 @@ Slime definitions, Life and New live here.
var/shiny = 0 var/shiny = 0
move_to_delay = 17 //Slimes shouldn't be able to go faster than humans. move_to_delay = 17 //Slimes shouldn't be able to go faster than humans.
default_chems = list("slimejelly" = 5) default_chems = list("slimejelly" = 5)
attacktext = "absorbed some of" attacktext = list("absorbed some of")
response_help = "pats" response_help = "pats"
response_disarm = "tries to stop" response_disarm = "tries to stop"
response_harm = "hits" response_harm = "hits"

2
code/modules/xenobio2/mob/xeno.dm
View File

@@ -12,7 +12,7 @@ Also includes Life and New
desc = "Something's broken, yell at someone." desc = "Something's broken, yell at someone."
melee_damage_lower = 0 melee_damage_lower = 0
melee_damage_upper = 0 melee_damage_upper = 0
attacktext = "hit" attacktext = list("hit")
attack_sound = null attack_sound = null
friendly = "touches" friendly = "touches"
environment_smash = 0 environment_smash = 0